Index: applications/product/webapp/catalog/FastLoadCache.ftl =================================================================== --- applications/product/webapp/catalog/FastLoadCache.ftl (revision 493251) +++ applications/product/webapp/catalog/FastLoadCache.ftl (working copy) @@ -21,7 +21,7 @@
<#list messageList as message> -
${message}
+

${message}

Index: applications/product/webapp/catalog/catalog/FindProdCatalog.ftl =================================================================== --- applications/product/webapp/catalog/catalog/FindProdCatalog.ftl (revision 493251) +++ applications/product/webapp/catalog/catalog/FindProdCatalog.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductProductCatalogsList}
+

${uiLabelMap.ProductProductCatalogsList}

[${uiLabelMap.ProductCreateNewProdCatalog}]

@@ -20,14 +20,14 @@
- - - + + + <#list prodCatalogs as prodCatalog> - - + +
${uiLabelMap.ProductCatalogNameId}
${uiLabelMap.ProductUseQuickAdd}?
 

${uiLabelMap.ProductCatalogNameId}

${uiLabelMap.ProductUseQuickAdd}?

 
 ${prodCatalog.catalogName} [${prodCatalog.prodCatalogId}]
 ${prodCatalog.useQuickAdd?if_exists}

 ${prodCatalog.catalogName} [${prodCatalog.prodCatalogId}]

 ${prodCatalog.useQuickAdd?if_exists}

 [${uiLabelMap.CommonEdit}] Index: applications/product/webapp/catalog/category/EditCategory.ftl =================================================================== --- applications/product/webapp/catalog/category/EditCategory.ftl (revision 493251) +++ applications/product/webapp/catalog/category/EditCategory.ftl (working copy) @@ -41,7 +41,7 @@
- +
${uiLabelMap.ProductProductCategoryId}

${uiLabelMap.ProductProductCategoryId}

   @@ -51,7 +51,7 @@ - +
${uiLabelMap.ProductProductCategoryId}

${uiLabelMap.ProductProductCategoryId}

   @@ -63,7 +63,7 @@ - + - + - + @@ -87,7 +87,7 @@ - + @@ -93,7 +93,7 @@ <#-- - + @@ -100,7 +100,7 @@ --> - + - + @@ -46,23 +46,23 @@ - + - + - + - + - + Index: applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl =================================================================== --- applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl (revision 493251) +++ applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl (working copy) @@ -60,11 +60,11 @@
${uiLabelMap.ProductProductCategoryId}

${uiLabelMap.ProductProductCategoryId}

   ${productCategoryId} (${uiLabelMap.ProductNotModificationRecrationCategory}.) @@ -71,7 +71,7 @@
${uiLabelMap.ProductProductCategoryType}

${uiLabelMap.ProductProductCategoryType}

  
${uiLabelMap.ProductName}

${uiLabelMap.ProductName}

   value="${productCategory.categoryName?if_exists}" name="categoryName" size="60" maxlength="60" class="inputBox"/>
value="${productCategory.categoryName?if_exists}" name="categoryName" size="60" maxlength="60" class="inputBox"/>
${uiLabelMap.ProductDescription}

${uiLabelMap.ProductDescription}

  
${uiLabelMap.ProductLongDescription}

${uiLabelMap.ProductLongDescription}

  
-
${uiLabelMap.ProductCategoryImageUrl}
+

${uiLabelMap.ProductCategoryImageUrl}

<#if (productCategory.categoryImageUrl)?exists> Category Image @@ -120,7 +120,7 @@
-
${uiLabelMap.ProductLinkOneImageUrl}
+

${uiLabelMap.ProductLinkOneImageUrl}

<#if (productCategory.linkOneImageUrl)?exists> Link One Image @@ -140,7 +140,7 @@
-
${uiLabelMap.ProductLinkTwoImageUrl}
+

${uiLabelMap.ProductLinkTwoImageUrl}

<#if (productCategory.linkTwoImageUrl)?exists> Link One Image @@ -160,7 +160,7 @@
${uiLabelMap.ProductDetailScreen}

${uiLabelMap.ProductDetailScreen}

   value="${productCategory.detailScreen?if_exists}" name="detailScreen" size="60" maxlength="250" class="inputBox"/> @@ -169,7 +169,7 @@
${uiLabelMap.ProductPrimaryParentCategory}

${uiLabelMap.ProductPrimaryParentCategory}

  
@@ -210,10 +210,10 @@ ${uiLabelMap.ProductLinkOneImageUrl} ${uiLabelMap.ProductLinkTwoImageUrl} - +
-
${uiLabelMap.ProductDuplicateProductCategory}
+

${uiLabelMap.ProductDuplicateProductCategory}

${uiLabelMap.ProductDuplicateProductCategorySelected}: @@ -218,9 +218,9 @@ ${uiLabelMap.ProductDuplicateProductCategorySelected}:
-   +  
-
+

${uiLabelMap.CommonDuplicate}: ${uiLabelMap.ProductCategoryContent}  ${uiLabelMap.ProductCategoryRollupParentCategories}  @@ -230,6 +230,6 @@ ${uiLabelMap.ProductFeatures}  ${uiLabelMap.PartyParties}  ${uiLabelMap.ProductAttributes}  -

+

Index: applications/product/webapp/catalog/category/EditCategoryContent.ftl =================================================================== --- applications/product/webapp/catalog/category/EditCategoryContent.ftl (revision 493251) +++ applications/product/webapp/catalog/category/EditCategoryContent.ftl (working copy) @@ -17,7 +17,7 @@
-
${uiLabelMap.ProductOverrideSimpleFields}
+

${uiLabelMap.ProductOverrideSimpleFields}

@@ -22,7 +22,7 @@
- + - + - + - + @@ -81,38 +81,38 @@ - + - + - + - + - + @@ -117,10 +117,10 @@
${uiLabelMap.ProductProductCategoryType}

${uiLabelMap.ProductProductCategoryType}

  
${uiLabelMap.ProductDescription}

${uiLabelMap.ProductDescription}

   @@ -42,7 +42,7 @@
${uiLabelMap.ProductLongDescription}

${uiLabelMap.ProductLongDescription}

   @@ -49,7 +49,7 @@
${uiLabelMap.ProductDetailScreen}

${uiLabelMap.ProductDetailScreen}

   value="${productCategory.detailScreen?if_exists}" name="detailScreen" size="60" maxlength="250" class="inputBox"> Index: applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl =================================================================== --- applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (revision 493251) +++ applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (working copy) @@ -19,10 +19,10 @@ <#-- Feature Groups --> - - - - + + + + <#assign line = 0> <#list productFeatureCatGrpAppls as productFeatureCatGrpAppl> @@ -55,7 +55,7 @@ -
${uiLabelMap.ProductApplyFeatureGroupFromCategory}:
+

${uiLabelMap.ProductApplyFeatureGroupFromCategory}:

${uiLabelMap.ProductFeatureGroup}
${uiLabelMap.CommonFromDateTime}
${uiLabelMap.CommonThruDateTime}
 

${uiLabelMap.ProductFeatureGroup}

${uiLabelMap.CommonFromDateTime}

${uiLabelMap.CommonThruDateTime}

 
- - - - + + + + <#assign line = 0> <#list productFeatureCategoryAppls as productFeatureCategoryAppl> @@ -107,7 +107,7 @@ -
${uiLabelMap.ProductApplyFeatureGroupToCategory}:
+

${uiLabelMap.ProductApplyFeatureGroupToCategory}:

${uiLabelMap.ProductFeatureCategory}
${uiLabelMap.CommonFromDateTime}
${uiLabelMap.CommonThruDateTime}
 

${uiLabelMap.ProductFeatureCategory}

${uiLabelMap.CommonFromDateTime}

${uiLabelMap.CommonThruDateTime}

 
- - - - - + + + + + <#assign line = 0> <#list productCategoryRoles as productCategoryRole> @@ -30,7 +30,7 @@ <#assign curRoleType = productCategoryRole.getRelatedOneCache("RoleType")> - + <#assign hasntStarted = false> <#if (productCategoryRole.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productCategoryRole.getTimestamp("fromDate"))> <#assign hasntStarted = true> @@ -58,7 +58,7 @@ -
${uiLabelMap.ProductAssociatePartyToCategory}:
+

${uiLabelMap.ProductAssociatePartyToCategory}:


${uiLabelMap.PartyPartyId}
${uiLabelMap.PartyRole}
${uiLabelMap.CommonFromDateTime}
${uiLabelMap.CommonThruDateTime}
 

${uiLabelMap.PartyPartyId}

${uiLabelMap.PartyRole}

${uiLabelMap.CommonFromDateTime}

${uiLabelMap.CommonThruDateTime}

 
[${(productCategoryRole.partyId)?if_exists}]
${(curRoleType.get("description",locale))?if_exists}

${(curRoleType.get("description",locale))?if_exists}
style="color: red;">${(productCategoryRole.fromDate)?if_exists}
- - - - - + + + + + <#assign line = 0> <#list prodCatalogCategories as prodCatalogCategory> @@ -32,7 +32,7 @@ <#assign hasntStarted = false> <#if (prodCatalogCategory.getTimestamp("fromDate"))?exists && nowTimestamp.before(prodCatalogCategory.getTimestamp("fromDate"))> <#assign hasntStarted = true> @@ -74,7 +74,7 @@ -
${uiLabelMap.ProductAddCatalogProductCategory}:
+

${uiLabelMap.ProductAddCatalogProductCategory}:


${uiLabelMap.ProductCatalogNameId}
${uiLabelMap.CommonType}
${uiLabelMap.CommonFromDateTime}
${uiLabelMap.ProductThruDateTimeSequence}
 

${uiLabelMap.ProductCatalogNameId}

${uiLabelMap.CommonType}

${uiLabelMap.CommonFromDateTime}

${uiLabelMap.ProductThruDateTimeSequence}

 
<#if prodCatalog?exists>${(prodCatalog.catalogName)?if_exists} [${(prodCatalogCategory.prodCatalogId)?if_exists}] -
${(curProdCatalogCategoryType.get("description",locale))?default(prodCatalogCategory.prodCatalogCategoryTypeId)}
+

${(curProdCatalogCategoryType.get("description",locale))?default(prodCatalogCategory.prodCatalogCategoryTypeId)}
- - - - + + + + <#if (listSize > 0)> @@ -112,8 +112,8 @@ -
${uiLabelMap.ProductAddProductCategoryMember}:
-
+

${uiLabelMap.ProductAddProductCategoryMember}:

+

${uiLabelMap.ProductProductId}: Lookup ${uiLabelMap.CommonFromDate}: @@ -121,7 +121,7 @@
${uiLabelMap.CommonComments}: -

+


@@ -129,8 +129,8 @@ -
${uiLabelMap.ProductCopyProductCategoryMembersToAnotherCategory}:
-
+

${uiLabelMap.ProductCopyProductCategoryMembersToAnotherCategory}:

+

${uiLabelMap.ProductTargetProductCategory}: -

+


@@ -156,12 +156,12 @@ -
${uiLabelMap.ProductExpireAllProductMembers}:
-
+

${uiLabelMap.ProductExpireAllProductMembers}:

+

${uiLabelMap.ProductOptionalExpirationDate}: Calendar    -

+


@@ -168,11 +168,11 @@ -
${uiLabelMap.ProductRemoveExpiredProductMembers}:
-
+

${uiLabelMap.ProductRemoveExpiredProductMembers}:

+

${uiLabelMap.ProductOptionalExpiredBeforeDate}: Calendar    -

+

Index: applications/product/webapp/catalog/category/EditCategoryRollup.ftl =================================================================== --- applications/product/webapp/catalog/category/EditCategoryRollup.ftl (revision 493251) +++ applications/product/webapp/catalog/category/EditCategoryRollup.ftl (working copy) @@ -20,10 +20,10 @@
${uiLabelMap.ProductProductNameId}
${uiLabelMap.CommonFromDateTime}
${uiLabelMap.ProductThruDateTimeSequenceQuantity}
${uiLabelMap.CommonComments}
 

${uiLabelMap.ProductProductNameId}

${uiLabelMap.CommonFromDateTime}

${uiLabelMap.ProductThruDateTimeSequenceQuantity}
${uiLabelMap.CommonComments}

 
- - - - + + + + <#if currentProductCategoryRollups.size() != 0> @@ -63,7 +63,7 @@ <#if currentProductCategoryRollups.size() == 0> - +
${uiLabelMap.ProductParentCategoryId}
${uiLabelMap.CommonFromDate}
${uiLabelMap.ProductThruDateTimeSequence}
 

${uiLabelMap.ProductParentCategoryId}

${uiLabelMap.CommonFromDate}

${uiLabelMap.ProductThruDateTimeSequence}

 
${uiLabelMap.ProductNoParentCategoriesFound}.

${uiLabelMap.ProductNoParentCategoriesFound}.
@@ -71,7 +71,7 @@ -
${uiLabelMap.CommonAddA} ${uiLabelMap.ProductParent} ${uiLabelMap.ProductCategorySelectCategoryAndEnterFromDate}:
+

${uiLabelMap.CommonAddA} ${uiLabelMap.ProductParent} ${uiLabelMap.ProductCategorySelectCategoryAndEnterFromDate}:

- - - - + + + + <#if parentProductCategoryRollups.size() != 0> @@ -135,7 +135,7 @@ <#if parentProductCategoryRollups.size() == 0> - +
${uiLabelMap.ProductChildCategoryId}
${uiLabelMap.CommonFromDate}
${uiLabelMap.ProductThruDateTimeSequence}
 

${uiLabelMap.ProductChildCategoryId}

${uiLabelMap.CommonFromDate}

${uiLabelMap.ProductThruDateTimeSequence}

 
${uiLabelMap.ProductNoChildCategoriesFound}.

${uiLabelMap.ProductNoChildCategoriesFound}.
@@ -144,7 +144,7 @@ -
${uiLabelMap.CommonAddA} ${uiLabelMap.ProductChild} ${uiLabelMap.ProductCategorySelectCategoryAndEnterFromDate}:
+

${uiLabelMap.CommonAddA} ${uiLabelMap.ProductChild} ${uiLabelMap.ProductCategorySelectCategoryAndEnterFromDate}:

@@ -42,8 +42,8 @@ <#list products as product> - - + + @@ -49,7 +49,7 @@
${product.internalName?default("-no internal name-")} [${product.productId}]
${product.productName?default("-no name-")} [${product.productId}]

${product.internalName?default("-no internal name-")} [${product.productId}]

${product.productName?default("-no name-")} [${product.productId}]

 [${uiLabelMap.ProductThisIsIt}]
<#else> -
 ${uiLabelMap.ProductNoExistingProductsFound}.
+

 ${uiLabelMap.ProductNoExistingProductsFound}.


@@ -64,10 +64,10 @@
-
${productFeatureType.description}
+

${productFeatureType.description}

 -
+

${productFeature.description} <#if requestParameters["pftsel_" + productFeatureTypeId]?exists> @@ -76,7 +76,7 @@ [${uiLabelMap.ProductStandard}] -

+

${uiLabelMap.ProductInternalName}:

${uiLabelMap.ProductInternalName}:

 -
 ${requestParameters.internalName?default(" ")}
+

 ${requestParameters.internalName?default(" ")}
${uiLabelMap.ProductProductName}:

${uiLabelMap.ProductProductName}:

 -
 ${requestParameters.productName?default(" ")}
+

 ${requestParameters.productName?default(" ")}
${uiLabelMap.ProductShortDescription}:

${uiLabelMap.ProductShortDescription}:

 -
 ${requestParameters.description?default(" ")}
+

 ${requestParameters.description?default(" ")}
${uiLabelMap.ProductDefaultPrice}:

${uiLabelMap.ProductDefaultPrice}:

 -
 ${requestParameters.defaultPrice?default(" ")}
+

 ${requestParameters.defaultPrice?default(" ")}
${uiLabelMap.ProductAverageCost}:

${uiLabelMap.ProductAverageCost}:

 -
 ${requestParameters.averageCost?default(" ")}
+

 ${requestParameters.averageCost?default(" ")}
-
+

${uiLabelMap.ProductNewProductId}: -

+

Index: applications/product/webapp/catalog/category/createProductInCategoryStart.ftl =================================================================== --- applications/product/webapp/catalog/category/createProductInCategoryStart.ftl (revision 493251) +++ applications/product/webapp/catalog/category/createProductInCategoryStart.ftl (working copy) @@ -30,10 +30,10 @@ <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]>
-
${productFeatureType.description}:
+

${productFeatureType.description}:

 -
+

${uiLabelMap.ProductSelectable} -

+

${uiLabelMap.ProductInternalName}:

${uiLabelMap.ProductInternalName}:
${uiLabelMap.ProductProductName}:

${uiLabelMap.ProductProductName}:
${uiLabelMap.ProductShortDescription}:

${uiLabelMap.ProductShortDescription}:
${uiLabelMap.ProductDefaultPrice}:

${uiLabelMap.ProductDefaultPrice}:
${uiLabelMap.ProductAverageCost}:

${uiLabelMap.ProductAverageCost}:
-
${uiLabelMap.ProductCreateNewProductConfigItemContent}
+

${uiLabelMap.ProductCreateNewProductConfigItemContent}

<#if configItemId?has_content && configItem?has_content> ${prepareAddProductContentWrapper.renderFormString(context)} -
${uiLabelMap.ProductAddContentProductConfigItem}
+

${uiLabelMap.ProductAddContentProductConfigItem}

<#if configItemId?has_content && configItem?has_content> ${addProductContentWrapper.renderFormString(context)} @@ -71,7 +71,7 @@
-
${uiLabelMap.ProductOverrideSimpleFields}
+

${uiLabelMap.ProductOverrideSimpleFields}

@@ -76,7 +76,7 @@
- + - + @@ -119,9 +119,9 @@
-
${uiLabelMap.ProductUploadImage}
+

${uiLabelMap.ProductUploadImage}

- + Index: applications/product/webapp/catalog/config/EditProductConfigOptions.ftl =================================================================== --- applications/product/webapp/catalog/config/EditProductConfigOptions.ftl (revision 493251) +++ applications/product/webapp/catalog/config/EditProductConfigOptions.ftl (working copy) @@ -29,9 +29,9 @@ - + +
${uiLabelMap.CommonDescription}

${uiLabelMap.CommonDescription}

   @@ -83,7 +83,7 @@
${uiLabelMap.ProductLongDescription}

${uiLabelMap.ProductLongDescription}

   @@ -91,7 +91,7 @@
-
${uiLabelMap.ProductSmallImage}
+

${uiLabelMap.ProductSmallImage}

<#if (configItem.imageUrl)?exists> Image @@ -105,7 +105,7 @@ [.jpg] [.gif] [${uiLabelMap.CommonClear}] - +

${question.configOptionId} - ${question.configOptionName?if_exists}

${question.configOptionId} - ${question.configOptionName?if_exists}

 -
${question.description?if_exists}

${question.description?if_exists}

 [${uiLabelMap.CommonEdit}] [${uiLabelMap.CommonRemove}] @@ -46,10 +46,10 @@ <#-- new question / category --> <#if configOptionId?has_content> -
${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigOptions}:
+

${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigOptions}:

[${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigOptions}] <#else> -
${uiLabelMap.CommonCreateNew} ${uiLabelMap.ProductConfigOptions}
+

${uiLabelMap.CommonCreateNew} ${uiLabelMap.ProductConfigOptions}

${sections.render("CreateConfigOptionForm")} @@ -56,7 +56,7 @@ <#if (configOption?has_content)>
-
${uiLabelMap.ProductComponents} - ${uiLabelMap.CommonId}: ${configOption.configOptionId?if_exists} - ${configOption.description?if_exists}
+

${uiLabelMap.ProductComponents} - ${uiLabelMap.CommonId}: ${configOption.configOptionId?if_exists} - ${configOption.description?if_exists}

@@ -69,9 +69,9 @@ <#list configProducts as component> <#assign product = component.getRelatedOne("ProductProduct")> - - - + + + @@ -79,9 +79,9 @@
${uiLabelMap.CommonSequenceNum}
${component.sequenceNum?if_exists}
${component.productId?if_exists} - ${product.internalName?if_exists}
${component.quantity?if_exists}

${component.sequenceNum?if_exists}

${component.productId?if_exists} - ${product.internalName?if_exists}

${component.quantity?if_exists}

 [${uiLabelMap.CommonEdit}] [${uiLabelMap.CommonRemove}]
<#if !productConfigProduct?has_content> -
${uiLabelMap.CommonAddA} ${uiLabelMap.ProductConfigs}:
+

${uiLabelMap.CommonAddA} ${uiLabelMap.ProductConfigs}:

<#else> -
${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigs}:
+

${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigs}:

[${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}] ${sections.render("CreateConfigProductForm")} Index: applications/product/webapp/catalog/config/FindProductConfigItems.ftl =================================================================== --- applications/product/webapp/catalog/config/FindProductConfigItems.ftl (revision 493251) +++ applications/product/webapp/catalog/config/FindProductConfigItems.ftl (working copy) @@ -44,7 +44,7 @@
-
[${uiLabelMap.CommonCreateNew} ${uiLabelMap.ProductConfigItem}]
+

[${uiLabelMap.CommonCreateNew} ${uiLabelMap.ProductConfigItem}]


@@ -60,11 +60,11 @@ <#assign rowClass = "viewManyTR2"> <#list itemsList[lowIndex..highIndex-1] as item> - - + - +

+ @@ -78,7 +78,7 @@ <#else> - +
${item.configItemId} - ${item.configItemName?default("")}
+

${item.configItemId} - ${item.configItemName?default("")}

<#if item.configItemTypeId?if_exists == "SINGLE">${uiLabelMap.ProductSingleChoice}<#else>${uiLabelMap.ProductMultiChoice} -

${item.description?default("No Description")}

${item.description?default("No Description")}

 ${uiLabelMap.CommonEdit}
${uiLabelMap.CommonNo} ${uiLabelMap.ProductConfigItems} ${uiLabelMap.CommonFound}.

${uiLabelMap.CommonNo} ${uiLabelMap.ProductConfigItems} ${uiLabelMap.CommonFound}.
Index: applications/product/webapp/catalog/feature/BulkAddFeature.ftl =================================================================== --- applications/product/webapp/catalog/feature/BulkAddFeature.ftl (revision 493251) +++ applications/product/webapp/catalog/feature/BulkAddFeature.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductAddProductFeatureInBulk} ${uiLabelMap.CommonFor} ${featureCategory.description}
+

${uiLabelMap.ProductAddProductFeatureInBulk} ${uiLabelMap.CommonFor} ${featureCategory.description}

@@ -23,11 +23,11 @@ - - - - - + + + + + <#list 0..featureNum-1 as feature> Index: applications/product/webapp/catalog/feature/CreateFeatureCategory.ftl =================================================================== --- applications/product/webapp/catalog/feature/CreateFeatureCategory.ftl (revision 493251) +++ applications/product/webapp/catalog/feature/CreateFeatureCategory.ftl (working copy) @@ -16,15 +16,15 @@ --> -
${uiLabelMap.ProductCreateAProductFeatureCategory}:
+

${uiLabelMap.ProductCreateAProductFeatureCategory}:


${uiLabelMap.CommonDescription}
${uiLabelMap.ProductFeatureType}
${uiLabelMap.ProductIdSeqNum}
${uiLabelMap.ProductIdCode}
${uiLabelMap.CommonAll}

${uiLabelMap.CommonDescription}

${uiLabelMap.ProductFeatureType}

${uiLabelMap.ProductIdSeqNum}

${uiLabelMap.ProductIdCode}

${uiLabelMap.CommonAll}
- + - +
${uiLabelMap.CommonDescription}:

${uiLabelMap.CommonDescription}:
${uiLabelMap.ProductParentCategory}:

${uiLabelMap.ProductParentCategory}:

 @@ -29,11 +29,11 @@ - - - - - + + + + + Index: applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl =================================================================== --- applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (revision 493251) +++ applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (working copy) @@ -15,16 +15,16 @@ under the License. --> -
${uiLabelMap.ProductEditFeaturesForFeatureCategory} "${(curProductFeatureCategory.description)?if_exists}"
+

${uiLabelMap.ProductEditFeaturesForFeatureCategory} "${(curProductFeatureCategory.description)?if_exists}"

[${uiLabelMap.ProductCreateNewFeature}]
-
+

${uiLabelMap.CommonAdd} ${uiLabelMap.ProductAddFeatureToCategory} - -

+ +


@@ -57,17 +57,17 @@ - - - - - - - - - - - + + + + + + + + + + + <#if (listSize > 0)> <#assign rowCount = 0> Index: applications/product/webapp/catalog/feature/EditFeatureGroups.ftl =================================================================== --- applications/product/webapp/catalog/feature/EditFeatureGroups.ftl (revision 493251) +++ applications/product/webapp/catalog/feature/EditFeatureGroups.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductFeatureGroup}
+

${uiLabelMap.ProductFeatureGroup}


${uiLabelMap.CommonId}
${uiLabelMap.CommonDescription}
${uiLabelMap.ProductParentCategory}
 
 

${uiLabelMap.CommonId}

${uiLabelMap.CommonDescription}

${uiLabelMap.ProductParentCategory}

 

 
${uiLabelMap.CommonId}
${uiLabelMap.CommonDescription}
${uiLabelMap.ProductFeatureType}
${uiLabelMap.ProductFeatureCategory}
${uiLabelMap.ProductUnitOfMeasureId}
${uiLabelMap.ProductQuantity}
${uiLabelMap.ProductAmount}
${uiLabelMap.ProductIdSeqNum}
${uiLabelMap.ProductIdCode}
${uiLabelMap.ProductAbbrev}
${uiLabelMap.CommonAll}

${uiLabelMap.CommonId}

${uiLabelMap.CommonDescription}

${uiLabelMap.ProductFeatureType}

${uiLabelMap.ProductFeatureCategory}

${uiLabelMap.ProductUnitOfMeasureId}

${uiLabelMap.ProductQuantity}

${uiLabelMap.ProductAmount}

${uiLabelMap.ProductIdSeqNum}

${uiLabelMap.ProductIdCode}

${uiLabelMap.ProductAbbrev}

${uiLabelMap.CommonAll}
@@ -20,10 +20,10 @@
- - - - + + + + <#list productFeatureGroups as productFeatureGroup> Index: applications/product/webapp/catalog/find/FindProductById.ftl =================================================================== --- applications/product/webapp/catalog/find/FindProductById.ftl (revision 493251) +++ applications/product/webapp/catalog/find/FindProductById.ftl (working copy) @@ -22,7 +22,7 @@
-
${uiLabelMap.CommonId} ${uiLabelMap.CommonValue}:  ${uiLabelMap.CommonFind}
+

${uiLabelMap.CommonId} ${uiLabelMap.CommonValue}:  ${uiLabelMap.CommonFind}

@@ -28,7 +28,7 @@ -
${uiLabelMap.ProductSearchResultsWithIdValue}: [${idValue?if_exists}]
+

${uiLabelMap.ProductSearchResultsWithIdValue}: [${idValue?if_exists}]

<#if !goodIdentifications?has_content && !idProduct?has_content> @@ -33,7 +33,7 @@ <#if !goodIdentifications?has_content && !idProduct?has_content>
-
 ${uiLabelMap.ProductNoResultsFound}.
+

 ${uiLabelMap.ProductNoResultsFound}.

<#else/>
${uiLabelMap.CommonId}
${uiLabelMap.CommonDescription}
 
 

${uiLabelMap.CommonId}

${uiLabelMap.CommonDescription}

 

 
<#if idProduct?has_content> @@ -38,7 +38,7 @@
<#if idProduct?has_content> <#else> @@ -36,10 +36,10 @@ <#else> @@ -55,10 +55,10 @@ @@ -78,14 +78,14 @@ @@ -90,14 +90,14 @@ <#list productFeatureTypeIdsOrdered as productFeatureTypeId> @@ -106,10 +106,10 @@ <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]> @@ -122,10 +122,10 @@ @@ -137,10 +137,10 @@ <#if searchConstraintStrings?has_content> @@ -162,17 +162,17 @@ <#if searchConstraintStrings?has_content> @@ -178,9 +178,9 @@
-
[${idProduct.productId}]
+

[${idProduct.productId}]

    @@ -51,7 +51,7 @@ <#assign goodIdentificationType = goodIdentification.getRelatedOneCache("GoodIdentificationType")/>
-
[${product.productId}]
+

[${product.productId}]

    Index: applications/product/webapp/catalog/find/advancedsearch.ftl =================================================================== --- applications/product/webapp/catalog/find/advancedsearch.ftl (revision 493251) +++ applications/product/webapp/catalog/find/advancedsearch.ftl (working copy) @@ -14,7 +14,7 @@ License for the specific language governing permissions and limitations under the License. --> -
${uiLabelMap.ProductAdvancedSearchinCategory}
+

${uiLabelMap.ProductAdvancedSearchinCategory}


@@ -23,14 +23,14 @@
-
${uiLabelMap.ProductCategory}:
+

${uiLabelMap.ProductCategory}:

 -
+

"${(searchCategory.description)?if_exists}" [${(searchCategory.productCategoryId)?if_exists}] ${uiLabelMap.ProductIncludeSubCategories}? ${uiLabelMap.CommonYes} ${uiLabelMap.CommonNo} -

+

-
${uiLabelMap.ProductCatalog}:
+

${uiLabelMap.ProductCatalog}:

 -
+

-

+

-
${uiLabelMap.ProductCategory}:
+

${uiLabelMap.ProductCategory}:

 -
+

${uiLabelMap.CommonNo} -

+

-
${uiLabelMap.ProductKeywords}:
+

${uiLabelMap.ProductKeywords}:

 -
+

  ${uiLabelMap.CommonAny}checked/> ${uiLabelMap.CommonAll}checked/> -

+

-
${uiLabelMap.ProductFeatures} ${uiLabelMap.CommonIds}:
+

${uiLabelMap.ProductFeatures} ${uiLabelMap.CommonIds}:

 -
+

      -

+

-
${(productFeatureType.get("description",locale))?if_exists}:
+

${(productFeatureType.get("description",locale))?if_exists}:

 -
+

-

+

-
${uiLabelMap.ProductSupplier}:
+

${uiLabelMap.ProductSupplier}:

 -
+

-

+

-
${uiLabelMap.CommonSortedBy}:
+

${uiLabelMap.CommonSortedBy}:

 -
+

${uiLabelMap.ProductLowToHigh} ${uiLabelMap.ProductHighToLow} -

+

-
${uiLabelMap.ProductLastSearch}
+

${uiLabelMap.ProductLastSearch}

 <#list searchConstraintStrings as searchConstraintString> -
 - ${searchConstraintString}
+

 - ${searchConstraintString}

-
${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}
-
+

${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}

+

${uiLabelMap.ProductNewSearch} ${uiLabelMap.ProductRefineSearch} -

+

-
+

${uiLabelMap.CommonFind} -

+

Index: applications/product/webapp/catalog/find/keywordsearch.ftl =================================================================== --- applications/product/webapp/catalog/find/keywordsearch.ftl (revision 493251) +++ applications/product/webapp/catalog/find/keywordsearch.ftl (working copy) @@ -15,15 +15,15 @@ under the License. --> -
${uiLabelMap.ProductSearchProducts}, ${uiLabelMap.ProductSearchFor}:
+

${uiLabelMap.ProductSearchProducts}, ${uiLabelMap.ProductSearchFor}:

<#list searchConstraintStrings as searchConstraintString> -
 [X] ${searchConstraintString}
+

 [X] ${searchConstraintString}

-
${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}
-
[${uiLabelMap.CommonRefine} ${uiLabelMap.CommonSearch}]
+

${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}

+

[${uiLabelMap.CommonRefine} ${uiLabelMap.CommonSearch}]

<#if !productIds?has_content> -
 ${uiLabelMap.ProductNoResultsFound}.
+

 ${uiLabelMap.ProductNoResultsFound}.

<#if productIds?has_content> @@ -102,7 +102,7 @@
-
${uiLabelMap.ProductNote}: ${uiLabelMap.ProductNoteKeywordSearch}
+

${uiLabelMap.ProductNote}: ${uiLabelMap.ProductNoteKeywordSearch}

${screens.render("component://product/widget/catalog/ProductScreens.xml#CreateVirtualWithVariantsFormInclude")} @@ -109,7 +109,7 @@
-
+

${uiLabelMap.ProductRemoveResultsFrom} ${uiLabelMap.ProductCategory}:
-

+

-
+

${uiLabelMap.ProductExpireResultsFrom} ${uiLabelMap.ProductCategory}:
-
+

-
+

${uiLabelMap.ProductAddResultsTo} ${uiLabelMap.ProductCategory}:
-
+

-
+

${uiLabelMap.ProductAddFeatureToResults}:
${uiLabelMap.ProductFeatureId} @@ -193,11 +193,11 @@
-
+

-
+

${uiLabelMap.ProductRemoveFeatureFromResults}:
${uiLabelMap.ProductFeatureId} @@ -204,5 +204,5 @@
-
+

Index: applications/product/webapp/catalog/find/keywordsearchbox.ftl =================================================================== --- applications/product/webapp/catalog/find/keywordsearchbox.ftl (revision 493251) +++ applications/product/webapp/catalog/find/keywordsearchbox.ftl (working copy) @@ -44,11 +44,11 @@
-
${uiLabelMap.ProductKeywords}:
-
+

${uiLabelMap.ProductKeywords}:

+

${uiLabelMap.ProductCategoryId}: -

-
+

+

${uiLabelMap.CommonNoContains}checked="checked"/> ${uiLabelMap.CommonAny}checked="checked"/> ${uiLabelMap.CommonAll}checked="checked"/> @@ -53,7 +53,7 @@ ${uiLabelMap.CommonAny}checked="checked"/> ${uiLabelMap.CommonAll}checked="checked"/>  ${uiLabelMap.CommonFind} -

+

@@ -58,12 +58,12 @@
-
+

${uiLabelMap.ProductCategoryId}: -

-
+

+

${uiLabelMap.ProductAdvancedSearch} -

+

@@ -26,8 +26,8 @@ <#list searchFeatures as searchFeature> - - + @@ -57,8 +57,8 @@
${searchFeature.featureType}
+

${searchFeature.featureType}

- +

- - + + <#list variantProducts as variant> @@ -63,8 +63,8 @@ <#list variantProducts as variant> - - + +
 
${uiLabelMap.ProductBrandName}
${uiLabelMap.ProductInternalName}

${uiLabelMap.ProductBrandName}

${uiLabelMap.ProductInternalName}
${variant.productId}
${variant.brandName?if_exists}
${variant.internalName?if_exists}

${variant.brandName?if_exists}

${variant.internalName?if_exists}
Index: applications/product/webapp/catalog/main.ftl =================================================================== --- applications/product/webapp/catalog/main.ftl (revision 493251) +++ applications/product/webapp/catalog/main.ftl (working copy) @@ -25,7 +25,7 @@
<#if security.hasEntityPermission("CATALOG", "_VIEW", session)> -
${uiLabelMap.ProductEditCatalogWithCatalogId}:
+

${uiLabelMap.ProductEditCatalogWithCatalogId}:

@@ -30,9 +30,9 @@
-
${uiLabelMap.CommonOr}: ${uiLabelMap.ProductCreateNewCatalog}
+

${uiLabelMap.CommonOr}: ${uiLabelMap.ProductCreateNewCatalog}


-
${uiLabelMap.ProductEditCategoryWithCategoryId}:
+

${uiLabelMap.ProductEditCategoryWithCategoryId}:

@@ -37,9 +37,9 @@
-
${uiLabelMap.CommonOr}: ${uiLabelMap.ProductCreateNewCategory}
+

${uiLabelMap.CommonOr}: ${uiLabelMap.ProductCreateNewCategory}


-
${uiLabelMap.ProductEditProductWithProductId}:
+

${uiLabelMap.ProductEditProductWithProductId}:

@@ -44,10 +44,10 @@
-
${uiLabelMap.CommonOr}: ${uiLabelMap.ProductCreateNewProduct}
-
${uiLabelMap.CommonOr}: ${uiLabelMap.ProductQuickCreateVirtualFromVariants}
+

${uiLabelMap.CommonOr}: ${uiLabelMap.ProductCreateNewProduct}

+

${uiLabelMap.CommonOr}: ${uiLabelMap.ProductQuickCreateVirtualFromVariants}


-
${uiLabelMap.ProductFindProductWithIdValue}:
+

${uiLabelMap.ProductFindProductWithIdValue}:

@@ -58,6 +58,6 @@
-
${uiLabelMap.ProductCatalogManagerIsFor}.
+

${uiLabelMap.ProductCatalogManagerIsFor}.

Index: applications/product/webapp/catalog/price/EditProductPriceRules.ftl =================================================================== --- applications/product/webapp/catalog/price/EditProductPriceRules.ftl (revision 493251) +++ applications/product/webapp/catalog/price/EditProductPriceRules.ftl (working copy) @@ -14,7 +14,7 @@ License for the specific language governing permissions and limitations under the License. --> -
${uiLabelMap.ProductGlobalPriceRule}
+

${uiLabelMap.ProductGlobalPriceRule}

[${uiLabelMap.ProductFindRule}]
@@ -21,9 +21,9 @@ - - - + + + <#if productPriceRule?exists> @@ -30,7 +30,7 @@ <#assign productPriceConds = productPriceRule.getRelated("ProductPriceCond")> <#assign productPriceActions = productPriceRule.getRelated("ProductPriceAction")> - + - +
${uiLabelMap.ProductRuleId}
${uiLabelMap.ProductRuleNameFromDateThruDate}
 

${uiLabelMap.ProductRuleId}

${uiLabelMap.ProductRuleNameFromDateThruDate}

 
${productPriceRule.productPriceRuleId}

${productPriceRule.productPriceRuleId}

 @@ -55,13 +55,13 @@
${uiLabelMap.ProductConditions}:

${uiLabelMap.ProductConditions}:

 - - - + + + <#assign maxCondSeqId = 1> <#list productPriceConds as productPriceCond> @@ -69,7 +69,7 @@ <#-- if cur seq id is a number and is greater than max, set new max for input box prefill below --> <#assign curCondSeqId = productPriceCond.productPriceCondSeqId?number> <#if (curCondSeqId >= maxCondSeqId)><#assign maxCondSeqId = curCondSeqId + 1> - + - +
${uiLabelMap.ProductSeqId}
${uiLabelMap.ProductInputOperatorValue}
 

${uiLabelMap.ProductSeqId}

${uiLabelMap.ProductInputOperatorValue}

 
${productPriceCond.productPriceCondSeqId}

${productPriceCond.productPriceCondSeqId}

 @@ -132,13 +132,13 @@
${uiLabelMap.ProductActions}:

${uiLabelMap.ProductActions}:

 - - - + + + <#assign maxActionSeqId = 1> <#list productPriceActions as productPriceAction> @@ -146,7 +146,7 @@ <#-- if cur seq id is a number and is greater than max, set new max for input box prefill below --> <#assign curActionSeqId = productPriceAction.productPriceActionSeqId?number> <#if (curActionSeqId >= maxActionSeqId)><#assign maxActionSeqId = curActionSeqId + 1> - + - + <#list taxItems as taxItem> - - - - - - - + + + + + + + <#if security.hasEntityPermission("TAXRATE", "_DELETE", session)> - + <#else> @@ -104,7 +104,7 @@ - + Index: applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl =================================================================== --- applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl (revision 493251) +++ applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl (working copy) @@ -36,7 +36,7 @@
${uiLabelMap.ProductSeqId}
${uiLabelMap.ProductActionTypeAmount}
 

${uiLabelMap.ProductSeqId}

${uiLabelMap.ProductActionTypeAmount}

 
${productPriceAction.productPriceActionSeqId}

${productPriceAction.productPriceActionSeqId}

 Index: applications/product/webapp/catalog/price/FindProductPriceRule.ftl =================================================================== --- applications/product/webapp/catalog/price/FindProductPriceRule.ftl (revision 493251) +++ applications/product/webapp/catalog/price/FindProductPriceRule.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductGlobalPriceRules}
+

${uiLabelMap.ProductGlobalPriceRules}

<#if activeOnly> [${uiLabelMap.ProductActiveAndInactive}] <#else> @@ -26,16 +26,16 @@ <#if productPriceRules?has_content> - - - - - + + + + + <#list productPriceRules as rule> - - + + - - - - - - - - - + + + + + + + + + <#assign rowCount = 0> <#if (listSize > 0)> Index: applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl =================================================================== --- applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl (revision 493251) +++ applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductQuickCreateVirtualFromVariants}
+

${uiLabelMap.ProductQuickCreateVirtualFromVariants}

${uiLabelMap.ProductVariantProductIds}: Index: applications/product/webapp/catalog/product/EditProductAssoc.ftl =================================================================== --- applications/product/webapp/catalog/product/EditProductAssoc.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditProductAssoc.ftl (working copy) @@ -20,11 +20,11 @@ <#if !(productAssoc?exists)> <#if productId?exists && productIdTo?exists && productAssocTypeId?exists && fromDate?exists> -<#--
Association not found: Product Id=${productId?if_exists}, Product Id To=${productIdTo?if_exists}, Association Type Id=${productAssocTypeId?if_exists}, From Date=${fromDate?if_exists}.
--> -
<#assign uiLabelWithVar=uiLabelMap.ProductAssociationNotFound?interpret><@uiLabelWithVar/>
+<#--

Association not found: Product Id=${productId?if_exists}, Product Id To=${productIdTo?if_exists}, Association Type Id=${productAssocTypeId?if_exists}, From Date=${fromDate?if_exists}.

--> +

<#assign uiLabelWithVar=uiLabelMap.ProductAssociationNotFound?interpret><@uiLabelWithVar/>

- + @@ -29,7 +29,7 @@ - + @@ -34,7 +34,7 @@ - + - + <#else> @@ -65,7 +65,7 @@ <#else> - + @@ -70,7 +70,7 @@ - + @@ -76,7 +76,7 @@ Click here For Field Lookup - + - + @@ -108,7 +108,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -129,17 +129,17 @@ - + - + @@ -144,7 +144,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -169,19 +169,19 @@
<#if productId?exists && product?exists>
-
${uiLabelMap.ProductAssociationsFromProduct}...
+

${uiLabelMap.ProductAssociationsFromProduct}...

${uiLabelMap.ProductPriceRuleNameId}
${uiLabelMap.ProductSaleRule}?
${uiLabelMap.CommonFromDate}
${uiLabelMap.CommonThruDate}
 

${uiLabelMap.ProductPriceRuleNameId}

${uiLabelMap.ProductSaleRule}?

${uiLabelMap.CommonFromDate}

${uiLabelMap.CommonThruDate}

 
 ${rule.ruleName?if_exists} [${rule.productPriceRuleId}]
 ${rule.isSale?if_exists}

 ${rule.ruleName?if_exists} [${rule.productPriceRuleId}]

 ${rule.isSale?if_exists}

 <#assign hasntStarted = false> <#if rule.fromDate?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(rule.getTimestamp("fromDate"))><#assign hasntStarted = true> @@ -62,8 +62,8 @@
-
${uiLabelMap.ProductAddPriceRule}:
+

${uiLabelMap.ProductAddPriceRule}:


${uiLabelMap.ProductName}: - + Index: applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl =================================================================== --- applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl (revision 493251) +++ applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl (working copy) @@ -58,15 +58,15 @@
${uiLabelMap.CommonId}
${uiLabelMap.CommonDescription}
${uiLabelMap.ProductFeatureType}
${uiLabelMap.ProductApplType}
${uiLabelMap.CommonFromDate}
${uiLabelMap.CommonThruDate}
${uiLabelMap.ProductAmount}
${uiLabelMap.CommonSequence}
${uiLabelMap.CommonAll}

${uiLabelMap.CommonId}

${uiLabelMap.CommonDescription}

${uiLabelMap.ProductFeatureType}

${uiLabelMap.ProductApplType}

${uiLabelMap.CommonFromDate}

${uiLabelMap.CommonThruDate}

${uiLabelMap.ProductAmount}

${uiLabelMap.CommonSequence}

${uiLabelMap.CommonAll}
${uiLabelMap.ProductProductId}

${uiLabelMap.ProductProductId}

  
${uiLabelMap.ProductProductIdTo}

${uiLabelMap.ProductProductIdTo}

  
${uiLabelMap.ProductAssociationTypeId}

${uiLabelMap.ProductAssociationTypeId}

  
${uiLabelMap.CommonFromDate}

${uiLabelMap.CommonFromDate}

   -
+

Calendar ${uiLabelMap.CommonSetNowEmpty} -

+

${uiLabelMap.ProductProductId}

${uiLabelMap.ProductProductId}

  
${uiLabelMap.ProductProductIdTo}

${uiLabelMap.ProductProductIdTo}

   Click here For Field Lookup
${uiLabelMap.ProductAssociationTypeId}

${uiLabelMap.ProductAssociationTypeId}

  
${uiLabelMap.CommonFromDate}

${uiLabelMap.CommonFromDate}

   -
+

Calendar ${uiLabelMap.CommonSetNowEmpty} -

+

${uiLabelMap.ProductProductId}

${uiLabelMap.ProductProductId}

   ${productId?if_exists} ${uiLabelMap.ProductRecreateAssociation}
${productId?if_exists} ${uiLabelMap.ProductRecreateAssociation}
${uiLabelMap.ProductProductIdTo}

${uiLabelMap.ProductProductIdTo}

   ${productIdTo?if_exists} ${uiLabelMap.ProductRecreateAssociation}
${productIdTo?if_exists} ${uiLabelMap.ProductRecreateAssociation}
${uiLabelMap.ProductAssociationType}

${uiLabelMap.ProductAssociationType}

   <#if curProductAssocType?exists>${(curProductAssocType.get("description",locale))?if_exists}<#else> ${productAssocTypeId?if_exists} ${uiLabelMap.ProductRecreateAssociation}
<#if curProductAssocType?exists>${(curProductAssocType.get("description",locale))?if_exists}<#else> ${productAssocTypeId?if_exists} ${uiLabelMap.ProductRecreateAssociation}
${uiLabelMap.CommonFromDate}

${uiLabelMap.CommonFromDate}

   ${fromDate?if_exists} ${uiLabelMap.ProductRecreateAssociation}
${uiLabelMap.CommonThruDate}

${uiLabelMap.CommonThruDate}

   -
+

value="${productAssoc.thruDate?if_exists}"<#else>value="${(request.getParameter("THRU_DATE"))?if_exists}" size="30" maxlength="30"> '${request.getParameter("THRU_DATE")}'<#else>'${nowTimestampString}');">Calendar -

+

${uiLabelMap.ProductSequenceNum}

${uiLabelMap.ProductSequenceNum}

   value="${(productAssoc.sequenceNum)?if_exists}"<#else>value="${(request.getParameter("SEQUENCE_NUM"))?if_exists}" size="5" maxlength="10">
value="${(productAssoc.sequenceNum)?if_exists}"<#else>value="${(request.getParameter("SEQUENCE_NUM"))?if_exists}" size="5" maxlength="10">
${uiLabelMap.ProductReason}

${uiLabelMap.ProductReason}

   value="${(productAssoc.reason)?if_exists}"<#else>value="${(request.getParameter("REASON"))?if_exists}" size="60" maxlength="255">
value="${(productAssoc.reason)?if_exists}"<#else>value="${(request.getParameter("REASON"))?if_exists}" size="60" maxlength="255">
${uiLabelMap.ProductInstruction}

${uiLabelMap.ProductInstruction}

   value="${(productAssoc.instruction)?if_exists}"<#else>value="${(request.getParameter("INSTRUCTION"))?if_exists}" size="60" maxlength="255">
${uiLabelMap.ProductQuantity}

${uiLabelMap.ProductQuantity}

   value="${(productAssoc.quantity)?if_exists}"<#else>value="${(request.getParameter("QUANTITY"))?if_exists}" size="10" maxlength="15">
- - - - - - - - - + + + + + + + + + <#list assocFromProducts as assocFromProduct> <#assign listToProduct = assocFromProduct.getRelatedOneCache("AssocProduct")> @@ -193,9 +193,9 @@ ${(assocFromProduct.fromDate)?if_exists}  - - - + + +
${uiLabelMap.ProductProductId}
${uiLabelMap.ProductName}
${uiLabelMap.CommonFromDateTime}
${uiLabelMap.CommonThruDateTime}
${uiLabelMap.ProductSeqNum}
${uiLabelMap.CommonQuantity}
${uiLabelMap.ProductAssociationType}
 
 

${uiLabelMap.ProductProductId}

${uiLabelMap.ProductName}

${uiLabelMap.CommonFromDateTime}

${uiLabelMap.CommonThruDateTime}

${uiLabelMap.ProductSeqNum}

${uiLabelMap.CommonQuantity}

${uiLabelMap.ProductAssociationType}

 

 
style="color: red;"> ${(assocFromProduct.thruDate)?if_exists} 
 ${(assocFromProduct.sequenceNum)?if_exists}
 ${(assocFromProduct.quantity)?if_exists}
<#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else>${(assocFromProduct.productAssocTypeId)?if_exists}

 ${(assocFromProduct.sequenceNum)?if_exists}

 ${(assocFromProduct.quantity)?if_exists}

<#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else>${(assocFromProduct.productAssocTypeId)?if_exists}

 " class="buttontext"> [${uiLabelMap.CommonDelete}] @@ -209,15 +209,15 @@
-
${uiLabelMap.ProductAssociationsToProduct}...
+

${uiLabelMap.ProductAssociationsToProduct}...

- - - - - - + + + + + + <#list assocToProducts as assocToProduct> <#assign listToProduct = assocToProduct.getRelatedOneCache("MainProduct")> @@ -225,9 +225,9 @@ - - - + + +
${uiLabelMap.ProductProductId}
${uiLabelMap.ProductName}
${uiLabelMap.CommonFromDateTime}
${uiLabelMap.CommonThruDateTime}
${uiLabelMap.ProductAssociationType}
 

${uiLabelMap.ProductProductId}

${uiLabelMap.ProductName}

${uiLabelMap.CommonFromDateTime}

${uiLabelMap.CommonThruDateTime}

${uiLabelMap.ProductAssociationType}

 
${(assocToProduct.productId)?if_exists} <#if listToProduct?exists>${(listToProduct.internalName)?if_exists}
${(assocToProduct.getTimestamp("fromDate"))?if_exists} 
${(assocToProduct.getTimestamp("thruDate"))?if_exists} 
<#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else> ${(assocToProduct.productAssocTypeId)?if_exists}

${(assocToProduct.getTimestamp("fromDate"))?if_exists} 

${(assocToProduct.getTimestamp("thruDate"))?if_exists} 

<#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else> ${(assocToProduct.productAssocTypeId)?if_exists}

 " class="buttontext"> [${uiLabelMap.CommonDelete}] @@ -237,5 +237,5 @@

-
${uiLabelMap.CommonNote} : ${uiLabelMap.ProductRedExplanation}
+

${uiLabelMap.CommonNote} : ${uiLabelMap.ProductRedExplanation}

Index: applications/product/webapp/catalog/product/EditProductAttributes.ftl =================================================================== --- applications/product/webapp/catalog/product/EditProductAttributes.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditProductAttributes.ftl (working copy) @@ -17,12 +17,12 @@ <#if productId?exists && product?exists> - - + + <#list productAttributes as productAttribute> - +
${uiLabelMap.ProductName}
${uiLabelMap.ProductValueType}

${uiLabelMap.ProductName}

${uiLabelMap.ProductValueType}
${(productAttribute.attrName)?if_exists}

${(productAttribute.attrName)?if_exists}

 @@ -46,7 +46,7 @@ -
${uiLabelMap.ProductAddProductAttributeNameValueType}:
+

${uiLabelMap.ProductAddProductAttributeNameValueType}:

      Index: applications/product/webapp/catalog/product/EditProductContent.ftl =================================================================== --- applications/product/webapp/catalog/product/EditProductContent.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditProductContent.ftl (working copy) @@ -73,11 +73,11 @@
-
${uiLabelMap.ProductCreateNewProductContent}
+

${uiLabelMap.ProductCreateNewProductContent}

<#if productId?has_content && product?has_content> ${prepareAddProductContentWrapper.renderFormString(context)} -
${uiLabelMap.ProductAddContentProduct}
+

${uiLabelMap.ProductAddContentProduct}

<#if productId?has_content && product?has_content> ${addProductContentWrapper.renderFormString(context)} @@ -84,7 +84,7 @@
-
${uiLabelMap.ProductOverrideSimpleFields}
+

${uiLabelMap.ProductOverrideSimpleFields}

@@ -89,7 +89,7 @@
- + - + - + - + - - - - - - - - + + + + + + + + @@ -265,7 +265,7 @@ <#if requestParameters.createNew?exists> -
${uiLabelMap.ProductNewShipmentEstimate} :
+

${uiLabelMap.ProductNewShipmentEstimate} :

@@ -463,7 +463,7 @@
${uiLabelMap.ProductProductName}

${uiLabelMap.ProductProductName}

   @@ -96,7 +96,7 @@
${uiLabelMap.ProductProductDescription}

${uiLabelMap.ProductProductDescription}

   @@ -103,7 +103,7 @@
${uiLabelMap.ProductLongDescription}

${uiLabelMap.ProductLongDescription}

   @@ -110,7 +110,7 @@
${uiLabelMap.ProductDetailScreen}

${uiLabelMap.ProductDetailScreen}

   @@ -119,7 +119,7 @@
-
${uiLabelMap.ProductSmallImage}
+

${uiLabelMap.ProductSmallImage}

<#if (product.smallImageUrl)?exists> Small Image @@ -139,7 +139,7 @@
-
${uiLabelMap.ProductMediumImage}
+

${uiLabelMap.ProductMediumImage}

<#if (product.mediumImageUrl)?exists> Medium Image @@ -159,7 +159,7 @@
-
${uiLabelMap.ProductLargeImage}
+

${uiLabelMap.ProductLargeImage}

<#if (product.largeImageUrl)?exists> Large Image @@ -179,7 +179,7 @@
-
${uiLabelMap.ProductDetailImage}
+

${uiLabelMap.ProductDetailImage}

<#if (product.detailImageUrl)?exists> Detail Image @@ -213,7 +213,7 @@ eval(toExec); }; -
${uiLabelMap.ProductUploadImage}
+

${uiLabelMap.ProductUploadImage}


@@ -223,6 +223,6 @@ ${uiLabelMap.CommonLarge} ${uiLabelMap.CommonDetail} - + Index: applications/product/webapp/catalog/product/EditProductDupForm.ftl =================================================================== --- applications/product/webapp/catalog/product/EditProductDupForm.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditProductDupForm.ftl (working copy) @@ -16,7 +16,7 @@ --> <#if productId?exists>
-
${uiLabelMap.ProductDuplicateProduct}
+

${uiLabelMap.ProductDuplicateProduct}

@@ -21,9 +21,9 @@
${uiLabelMap.ProductDuplicateRemoveSelectedWithNewId}: -   +  
-
+

${uiLabelMap.CommonDuplicate}: ${uiLabelMap.ProductPrices}  ${uiLabelMap.CommonId}  @@ -33,8 +33,8 @@ ${uiLabelMap.ProductAttributes}  ${uiLabelMap.ProductFeatureAppls}  ${uiLabelMap.ProductInventoryItems}  -

-
+

+

${uiLabelMap.CommonRemove}: ${uiLabelMap.ProductPrices}  ${uiLabelMap.CommonId}  @@ -44,14 +44,14 @@ ${uiLabelMap.ProductAttributes}  ${uiLabelMap.ProductFeatureAppls}  ${uiLabelMap.ProductInventoryItems}  -

+

<#if product?exists && product.isVirtual?if_exists == "Y">
-
${uiLabelMap.ProductUpdateProductVariants}
+

${uiLabelMap.ProductUpdateProductVariants}

-
+

${uiLabelMap.ProductUpdateProductVariants}: ${uiLabelMap.ProductRemoveBefore}  ${uiLabelMap.ProductPrices}  @@ -61,8 +61,8 @@ ${uiLabelMap.ProductAttributes}  ${uiLabelMap.ProductFacilities}  ${uiLabelMap.ProductLocations}  -

- +

+

Index: applications/product/webapp/catalog/product/EditProductFacilities.ftl =================================================================== --- applications/product/webapp/catalog/product/EditProductFacilities.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditProductFacilities.ftl (working copy) @@ -17,9 +17,9 @@ <#if productId?exists && product?exists> - - - + + + <#list productFacilities as productFacility> <#assign facility = productFacility.getRelatedOneCache("Facility")> @@ -24,7 +24,7 @@ <#list productFacilities as productFacility> <#assign facility = productFacility.getRelatedOneCache("Facility")> - + <#list featureTypes as featureType> - + - - - - + + + + <#assign defaultSequenceNum = 10> @@ -84,7 +84,7 @@ <#assign productFeatureIds = ""> <#list curProductFeatureAndAppls as productFeatureAndAppl> @@ -96,11 +96,11 @@ @@ -120,5 +120,5 @@
${uiLabelMap.ProductFacility}
${uiLabelMap.ProductMinimumStockReorderQuantityDaysToShip}
 

${uiLabelMap.ProductFacility}

${uiLabelMap.ProductMinimumStockReorderQuantityDaysToShip}

 
<#if facility?exists>${facility.facilityName}<#else>[${productFacility.facilityId}]

<#if facility?exists>${facility.facilityName}<#else>[${productFacility.facilityId}]
@@ -47,8 +47,8 @@ -
${uiLabelMap.ProductAddFacility}:
-
+

${uiLabelMap.ProductAddFacility}:

+

${uiLabelMap.ProductFacility}: ${uiLabelMap.ProductDaysToShip}:  -

+

Index: applications/product/webapp/catalog/product/EditProductFacilityLocations.ftl =================================================================== --- applications/product/webapp/catalog/product/EditProductFacilityLocations.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditProductFacilityLocations.ftl (working copy) @@ -18,10 +18,10 @@ <#if productId?exists && product?exists> - - - - + + + + <#list productFacilityLocations as productFacilityLocation> <#assign facility = productFacilityLocation.getRelatedOneCache("Facility")> @@ -28,8 +28,8 @@ <#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists> <#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists> - - + + - - - - - - - - + + + + + + + + <#assign rowCount = 0> <#list productFeatureAndAppls as productFeatureAndAppl> @@ -40,9 +40,9 @@ - - - + + + @@ -137,7 +137,7 @@ -
${uiLabelMap.ProductAddProductFeatureID}:
+

${uiLabelMap.ProductAddProductFeatureID}:


${uiLabelMap.CommonId}: Index: applications/product/webapp/catalog/product/EditProductGlAccounts.ftl =================================================================== --- applications/product/webapp/catalog/product/EditProductGlAccounts.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditProductGlAccounts.ftl (working copy) @@ -20,7 +20,7 @@ - + <#assign line = 0> <#list productGlAccounts as productGlAccount> @@ -28,10 +28,10 @@ <#assign productGlAccountType = productGlAccount.getRelatedOneCache("GlAccountType")> <#assign curGlAccount = productGlAccount.getRelatedOneCache("GlAccount")> - - + +

<#list featureTypeIds as featureTypeId> - + - - + +
${uiLabelMap.ProductFacility}
${uiLabelMap.ProductLocation}
${uiLabelMap.ProductMinimumStockAndMoveQuantity}
 

${uiLabelMap.ProductFacility}

${uiLabelMap.ProductLocation}

${uiLabelMap.ProductMinimumStockAndMoveQuantity}

 
<#if facility?exists>${facility.facilityName}<#else>[${productFacilityLocation.facilityId}]
<#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}<#if facilityLocationTypeEnum?has_content>(${facilityLocationTypeEnum.description})[${productFacilityLocation.locationSeqId}]

<#if facility?exists>${facility.facilityName}<#else>[${productFacilityLocation.facilityId}]

<#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}<#if facilityLocationTypeEnum?has_content>(${facilityLocationTypeEnum.description})[${productFacilityLocation.locationSeqId}]
@@ -51,8 +51,8 @@ -
${uiLabelMap.CommonAdd} ${uiLabelMap.ProductFacilityLocation}:
-
+

${uiLabelMap.CommonAdd} ${uiLabelMap.ProductFacilityLocation}:

+

${uiLabelMap.ProductFacility}: ${uiLabelMap.ProductMoveQuantity}:  -

+

Index: applications/product/webapp/catalog/product/EditProductFeatures.ftl =================================================================== --- applications/product/webapp/catalog/product/EditProductFeatures.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditProductFeatures.ftl (working copy) @@ -21,14 +21,14 @@
${uiLabelMap.CommonId}
${uiLabelMap.CommonDescription}
${uiLabelMap.ProductType}
${uiLabelMap.ProductCategory}
${uiLabelMap.CommonFromDate}
${uiLabelMap.ProductThruDateAmountSequenceApplicationType}
${uiLabelMap.CommonAll}

${uiLabelMap.CommonId}

${uiLabelMap.CommonDescription}

${uiLabelMap.ProductType}

${uiLabelMap.ProductCategory}

${uiLabelMap.CommonFromDate}

${uiLabelMap.ProductThruDateAmountSequenceApplicationType}

${uiLabelMap.CommonAll}
${(productFeatureAndAppl.productFeatureId)?if_exists}
${(productFeatureAndAppl.get("description",locale))?if_exists}
${(curProductFeatureType.get("description",locale))?default((productFeatureAndAppl.productFeatureTypeId)?if_exists)}

${(productFeatureAndAppl.productFeatureId)?if_exists}

${(productFeatureAndAppl.get("description",locale))?if_exists}

${(curProductFeatureType.get("description",locale))?default((productFeatureAndAppl.productFeatureTypeId)?if_exists)}

 ${(curProductFeatureCategory.description)?if_exists} [${(productFeatureAndAppl.productFeatureCategoryId)?if_exists}]
${uiLabelMap.ProductAccountType}
${uiLabelMap.ProductOrganization}
${uiLabelMap.ProductGlAccount}
 

 
<#if productGlAccountType?exists>${(productGlAccountType.get("description",locale))?if_exists}<#else>[${(productGlAccount.productGlAccountTypeId)?if_exists}]
+

<#if productGlAccountType?exists>${(productGlAccountType.get("description",locale))?if_exists}<#else>[${(productGlAccount.productGlAccountTypeId)?if_exists}]

${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, productGlAccount.getString("organizationPartyId"), true)} [${productGlAccount.organizationPartyId}] -

@@ -61,8 +61,8 @@ -
${uiLabelMap.ProductAddGlAccount} :
-
+

${uiLabelMap.ProductAddGlAccount} :

+

${uiLabelMap.ProductAccountType} : -

+

Index: applications/product/webapp/catalog/product/EditProductGoodIdentifications.ftl =================================================================== --- applications/product/webapp/catalog/product/EditProductGoodIdentifications.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditProductGoodIdentifications.ftl (working copy) @@ -17,9 +17,9 @@ <#if productId?exists && product?exists> - - - + + + <#assign line = 0> <#list goodIdentifications as goodIdentification> @@ -26,7 +26,7 @@ <#assign line = line + 1> <#assign goodIdentificationType = goodIdentification.getRelatedOneCache("GoodIdentificationType")> - +
${uiLabelMap.ProductIdType}
${uiLabelMap.ProductIdValue}
 

${uiLabelMap.ProductIdType}

${uiLabelMap.ProductIdValue}

 
<#if goodIdentificationType?exists>${(goodIdentificationType.get("description",locale))?if_exists}<#else>[${(goodIdentification.goodIdentificationTypeId)?if_exists}]

<#if goodIdentificationType?exists>${(goodIdentificationType.get("description",locale))?if_exists}<#else>[${(goodIdentification.goodIdentificationTypeId)?if_exists}]
@@ -47,8 +47,8 @@ -
${uiLabelMap.CommonAddId} :
-
+

${uiLabelMap.CommonAddId} :

+

${uiLabelMap.ProductIdType} : ${uiLabelMap.ProductIdValue} :   -

+

Index: applications/product/webapp/catalog/product/EditProductInventoryItems.ftl =================================================================== --- applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (working copy) @@ -22,14 +22,14 @@ - - - - - - - - + + + + + + + + <#list quantitySummaryByFacility.values() as quantitySummary> <#if quantitySummary.facilityId?exists> @@ -48,19 +48,19 @@ <#assign outgoingQuantityTotal = manufacturingOutQuantitySummary.estimatedQuantityTotal?if_exists> - - - - - + + + + + @@ -90,7 +90,7 @@
-
${uiLabelMap.ProductInventoryItems} ${uiLabelMap.CommonFor} <#if product?exists>${(product.internalName)?if_exists} [${uiLabelMap.CommonId}:${productId?if_exists}]
+

${uiLabelMap.ProductInventoryItems} ${uiLabelMap.CommonFor} <#if product?exists>${(product.internalName)?if_exists} [${uiLabelMap.CommonId}:${productId?if_exists}]

<#if productId?has_content> ${uiLabelMap.ProductCreateNewInventoryItemProduct} <#if showEmpty> @@ -103,17 +103,17 @@ <#if productId?exists>
${uiLabelMap.ProductFacility}
${uiLabelMap.ProductAtp}
${uiLabelMap.ProductQoh}
${uiLabelMap.ProductMarketingPackageATP}
${uiLabelMap.ProductMarketingPackageQOH}
${uiLabelMap.ProductIncomingShipments}
${uiLabelMap.ProductIncomingProductionRuns}
${uiLabelMap.ProductOutgoingProductionRuns}

${uiLabelMap.ProductFacility}

${uiLabelMap.ProductAtp}

${uiLabelMap.ProductQoh}

${uiLabelMap.ProductMarketingPackageATP}

${uiLabelMap.ProductMarketingPackageQOH}

${uiLabelMap.ProductIncomingShipments}

${uiLabelMap.ProductIncomingProductionRuns}

${uiLabelMap.ProductOutgoingProductionRuns}
${(facility.facilityName)?if_exists} [${facilityId?default("[No Facility]")}] - ${uiLabelMap.ProductInventoryReceive}
<#if totalAvailableToPromise?exists>${totalAvailableToPromise}<#else> 
<#if totalQuantityOnHand?exists>${totalQuantityOnHand}<#else> 
<#if mktgPkgATP?exists>${mktgPkgATP}<#else> 
<#if mktgPkgQOH?exists>${mktgPkgQOH}<#else> 

${(facility.facilityName)?if_exists} [${facilityId?default("[No Facility]")}] + ${uiLabelMap.ProductInventoryReceive}

<#if totalAvailableToPromise?exists>${totalAvailableToPromise}<#else> 

<#if totalQuantityOnHand?exists>${totalQuantityOnHand}<#else> 

<#if mktgPkgATP?exists>${mktgPkgATP}<#else> 

<#if mktgPkgQOH?exists>${mktgPkgQOH}<#else> 

 <#if incomingShipmentAndItemList?has_content> <#list incomingShipmentAndItemList as incomingShipmentAndItem> -
${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())?if_exists}-<#if incomingShipmentAndItem.quantity?exists>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]
+

${incomingShipmentAndItem.shipmentId}:${incomingShipmentAndItem.shipmentItemSeqId}-${(incomingShipmentAndItem.estimatedArrivalDate.toString())?if_exists}-<#if incomingShipmentAndItem.quantity?exists>${incomingShipmentAndItem.quantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]

<#else> -
 
+

 

 @@ -66,11 +66,11 @@ <#if incomingProductionRunList?has_content> <#list incomingProductionRunList as incomingProductionRun> -
${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())?if_exists}-<#if incomingProductionRun.estimatedQuantity?exists>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]
+

${incomingProductionRun.workEffortId}-${(incomingProductionRun.estimatedCompletionDate.toString())?if_exists}-<#if incomingProductionRun.estimatedQuantity?exists>${incomingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]

-
${uiLabelMap.CommonTotal}: ${incomingQuantityTotal?if_exists}
+

${uiLabelMap.CommonTotal}: ${incomingQuantityTotal?if_exists}

<#else> -
 
+

 

 @@ -76,11 +76,11 @@ <#if outgoingProductionRunList?has_content> <#list outgoingProductionRunList as outgoingProductionRun> -
${outgoingProductionRun.workEffortParentId}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())?if_exists}-<#if outgoingProductionRun.estimatedQuantity?exists>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]
+

${outgoingProductionRun.workEffortParentId}:${outgoingProductionRun.workEffortId}-${(outgoingProductionRun.estimatedStartDate.toString())?if_exists}-<#if outgoingProductionRun.estimatedQuantity?exists>${outgoingProductionRun.estimatedQuantity?string.number}<#else>[${uiLabelMap.ProductQuantityNotSet}]

-
${uiLabelMap.CommonTotal}: ${outgoingQuantityTotal?if_exists}
+

${uiLabelMap.CommonTotal}: ${outgoingQuantityTotal?if_exists}

<#else> -
 
+

 
- - - - - - - - - - - + + + + + + + + + + + <#list productInventoryItems as inventoryItem> <#if showEmpty || (inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM" && inventoryItem.statusId?if_exists != "INV_DELIVERED") @@ -127,9 +127,9 @@ <#if curInventoryItemType?exists> - + - - + + <#if inventoryItem.facilityId?exists && inventoryItem.containerId?exists> @@ -155,17 +155,17 @@ <#else> - - - + + + <#if inventoryItem.inventoryItemTypeId?if_exists == "NON_SERIAL_INV_ITEM"> <#elseif inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM"> - + <#else> Index: applications/product/webapp/catalog/product/EditProductKeyword.ftl =================================================================== --- applications/product/webapp/catalog/product/EditProductKeyword.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditProductKeyword.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> <#if productId?exists && product?exists> -
${uiLabelMap.ProductNoteKeywordsAutomaticallyCreated}
+

${uiLabelMap.ProductNoteKeywordsAutomaticallyCreated}

${uiLabelMap.ProductItemId}
${uiLabelMap.ProductItemType}
${uiLabelMap.ProductStatus}
${uiLabelMap.CommonReceived}
${uiLabelMap.CommonExpire}
${uiLabelMap.ProductFacilityContainerId}
${uiLabelMap.ProductLocation}
${uiLabelMap.ProductLotId}
${uiLabelMap.ProductBinNum}
${uiLabelMap.ProductPerUnitPrice}
${uiLabelMap.ProductAtpQohSerial}

${uiLabelMap.ProductItemId}

${uiLabelMap.ProductItemType}

${uiLabelMap.ProductStatus}

${uiLabelMap.CommonReceived}

${uiLabelMap.CommonExpire}

${uiLabelMap.ProductFacilityContainerId}

${uiLabelMap.ProductLocation}

${uiLabelMap.ProductLotId}

${uiLabelMap.ProductBinNum}

${uiLabelMap.ProductPerUnitPrice}

${uiLabelMap.ProductAtpQohSerial}
${(inventoryItem.inventoryItemId)?if_exists}
 ${(curInventoryItemType.get("description",locale))?if_exists}

 ${(curInventoryItemType.get("description",locale))?if_exists}

 -
+

<#if inventoryItem.inventoryItemTypeId?if_exists == "SERIALIZED_INV_ITEM"> <#if curStatusItem?has_content> ${(curStatusItem.get("description",locale))?if_exists} @@ -141,10 +141,10 @@ <#else>   -

+

 ${(inventoryItem.datetimeReceived)?if_exists}
 ${(inventoryItem.expireDate)?if_exists}

 ${(inventoryItem.datetimeReceived)?if_exists}

 ${(inventoryItem.expireDate)?if_exists}

${uiLabelMap.ProductErrorFacility} (${inventoryItem.facilityId}) ${uiLabelMap.ProductAndContainer} (${inventoryItem.containerId}) ${uiLabelMap.CommonSpecified}
 
<#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}<#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)}) [${(inventoryItem.locationSeqId)?if_exists}]
 ${(inventoryItem.lotId)?if_exists}
 ${(inventoryItem.binNumber)?if_exists}

<#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}<#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)}) [${(inventoryItem.locationSeqId)?if_exists}]

 ${(inventoryItem.lotId)?if_exists}

 ${(inventoryItem.binNumber)?if_exists}
 <@ofbizCurrency amount=inventoryItem.unitCost isoCode=inventoryItem.currencyUomId/>
 -
${(inventoryItem.availableToPromiseTotal)?default("NA")} - / ${(inventoryItem.quantityOnHandTotal)?default("NA")}
+

${(inventoryItem.availableToPromiseTotal)?default("NA")} + / ${(inventoryItem.quantityOnHandTotal)?default("NA")}

 ${(inventoryItem.serialNumber)?if_exists}

 ${(inventoryItem.serialNumber)?if_exists}

${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSerialNumber} (${(inventoryItem.serialNumber)?if_exists}) ${uiLabelMap.ProductAndQuantityOnHand} (${(inventoryItem.quantityOnHandTotal)?if_exists} ${uiLabelMap.CommonSpecified}
@@ -104,7 +104,7 @@ <#else> - +
${uiLabelMap.ProductNoKeywordsFound}

${uiLabelMap.ProductNoKeywordsFound}
@@ -115,5 +115,5 @@
<#else> -
${uiLabelMap.ProductProductNotFoundWithProduct} "${productId?if_exists}"
+

${uiLabelMap.ProductProductNotFoundWithProduct} "${productId?if_exists}"

Index: applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl =================================================================== --- applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl (revision 493251) +++ applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl (working copy) @@ -28,10 +28,10 @@
${variantSummary.productId}
${variantSummary[featureTypeId].description}

${variantSummary[featureTypeId].description}
${variantSummary.quantityOnHandTotal}
${variantSummary.availableToPromiseTotal}

${variantSummary.quantityOnHandTotal}

${variantSummary.availableToPromiseTotal}
Index: applications/product/webapp/catalog/product/QuickAddVariants.ftl =================================================================== --- applications/product/webapp/catalog/product/QuickAddVariants.ftl (revision 493251) +++ applications/product/webapp/catalog/product/QuickAddVariants.ftl (working copy) @@ -49,7 +49,7 @@
-
${uiLabelMap.ProductVariantAdd}:
+

${uiLabelMap.ProductVariantAdd}:

${uiLabelMap.ProductVariantProductIds}:
@@ -54,7 +54,7 @@
${uiLabelMap.ProductVariantProductIds}:
-
+
@@ -67,12 +67,12 @@
${featureType}

${featureType}
${uiLabelMap.ProductNewProductCreate} !
${uiLabelMap.ProductSequenceNum}
${uiLabelMap.ProductExistingVariant} :
${uiLabelMap.CommonAll}

${uiLabelMap.ProductNewProductCreate} !

${uiLabelMap.ProductSequenceNum}

${uiLabelMap.ProductExistingVariant} :

${uiLabelMap.CommonAll}
-
${productFeatureAndAppl.description?if_exists}
+

${productFeatureAndAppl.description?if_exists}

<#assign productFeatureIds = productFeatureIds + "|" + productFeatureAndAppl.productFeatureId> 		-
  +

  <#list existingVariantProductIds as existingVariantProductId> [${existingVariantProductId}]   -

+

@@ -114,7 +114,7 @@ <#assign columns = featureTypes.size() + 4> - +
<#else> -
${uiLabelMap.ProductNoSelectableFeaturesFound}
+

${uiLabelMap.ProductNoSelectableFeaturesFound}

Index: applications/product/webapp/catalog/promo/EditProductPromoCode.ftl =================================================================== --- applications/product/webapp/catalog/promo/EditProductPromoCode.ftl (revision 493251) +++ applications/product/webapp/catalog/promo/EditProductPromoCode.ftl (working copy) @@ -20,11 +20,11 @@ <#if productPromoCode.requireEmailOrParty?if_exists == "N">
${uiLabelMap.ProductNoteRequireEmailParty}
-
${uiLabelMap.ProductPromoCodeEmails}
+

${uiLabelMap.ProductPromoCodeEmails}

<#list productPromoCodeEmails as productPromoCodeEmail> -
[X] ${productPromoCodeEmail.emailAddress}
+

[X] ${productPromoCodeEmail.emailAddress}

-
+

${uiLabelMap.ProductAddEmail} : @@ -30,13 +30,13 @@ ${uiLabelMap.ProductAddEmail} :
-
+

-
${uiLabelMap.ProductPromoCodeParties}
+

${uiLabelMap.ProductPromoCodeParties}

<#list productPromoCodeParties as productPromoCodeParty> -
[X] ${productPromoCodeParty.partyId}
+

[X] ${productPromoCodeParty.partyId}

-
+

${uiLabelMap.ProductAddPartyId} : @@ -42,5 +42,5 @@ ${uiLabelMap.ProductAddPartyId} :
-
+

Index: applications/product/webapp/catalog/promo/EditProductPromoRules.ftl =================================================================== --- applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (revision 493251) +++ applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (working copy) @@ -20,9 +20,9 @@ - - - + + + <#list productPromoRules as productPromoRule> <#assign productPromoConds = productPromoRule.getRelated("ProductPromoCond")> @@ -28,7 +28,7 @@ <#assign productPromoConds = productPromoRule.getRelated("ProductPromoCond")> <#assign productPromoActions = productPromoRule.getRelated("ProductPromoAction")> - + - + - + + @@ -61,7 +61,7 @@ Index: applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl =================================================================== --- applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl (revision 493251) +++ applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl (working copy) @@ -22,7 +22,7 @@ - + <#list paymentSettings as setting> <#assign payMeth = setting.getRelatedOne("PaymentMethodType")> @@ -28,13 +28,13 @@ <#assign payMeth = setting.getRelatedOne("PaymentMethodType")> <#assign enum = setting.getRelatedOne("Enumeration")> - - - - - + + + + + @@ -104,7 +104,7 @@ - +
${uiLabelMap.ProductRuleId}
${uiLabelMap.ProductRuleName}
 

${uiLabelMap.ProductRuleId}

${uiLabelMap.ProductRuleName}

 
${(productPromoRule.productPromoRuleId)?if_exists}

${(productPromoRule.productPromoRuleId)?if_exists}
@@ -45,7 +45,7 @@
${uiLabelMap.ProductConditions}:

${uiLabelMap.ProductConditions}:

 <#assign maxCondSeqId = 1> @@ -58,7 +58,7 @@ <#assign maxCondSeqId = curCondSeqId + 1> - + - +
${(productPromoCond.productPromoCondSeqId)?if_exists}

${(productPromoCond.productPromoCondSeqId)?if_exists}

 @@ -98,7 +98,7 @@ <#list condProductPromoCategories as condProductPromoCategory> <#assign condProductCategory = condProductPromoCategory.getRelatedOneCache("ProductCategory")> <#assign condApplEnumeration = condProductPromoCategory.getRelatedOneCache("ApplEnumeration")> -
+

${(condProductCategory.get("description",locale))?if_exists} [${condProductPromoCategory.productCategoryId}] - ${(condApplEnumeration.get("description",locale))?default(condProductPromoCategory.productPromoApplEnumId)} - ${uiLabelMap.ProductSubCats}? ${condProductPromoCategory.includeSubCategories?default("N")} @@ -105,9 +105,9 @@ - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${condProductPromoCategory.andGroupId} [${uiLabelMap.CommonDelete}] -

+

-
+

@@ -130,7 +130,7 @@ ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: * -

+

<#-- ======================= Products ======================== -->
${uiLabelMap.ProductConditions} ${uiLabelMap.ProductProducts}:
<#assign condProductPromoProducts = productPromoCond.getRelated("ProductPromoProduct")> @@ -137,7 +137,7 @@ <#list condProductPromoProducts as condProductPromoProduct> <#assign condProduct = condProductPromoProduct.getRelatedOneCache("Product")?if_exists> <#assign condApplEnumeration = condProductPromoProduct.getRelatedOneCache("ApplEnumeration")> -
+

${(condProduct.internalName)?if_exists} [${condProductPromoProduct.productId}] - ${(condApplEnumeration.get("description",locale))?default(condProductPromoProduct.productPromoApplEnumId)} @@ -142,9 +142,9 @@ - ${(condApplEnumeration.get("description",locale))?default(condProductPromoProduct.productPromoApplEnumId)} [${uiLabelMap.CommonDelete}] -

+

-
+

@@ -158,7 +158,7 @@
-
+

@@ -193,7 +193,7 @@
${uiLabelMap.ProductActions} :

${uiLabelMap.ProductActions} :

 <#assign maxActionSeqId = 1> @@ -206,9 +206,9 @@ <#assign maxActionSeqId = curActionSeqId + 1> - +
${(productPromoAction.productPromoActionSeqId)?if_exists}

${(productPromoAction.productPromoActionSeqId)?if_exists}

 -
+

@@ -244,7 +244,7 @@ ${uiLabelMap.PartyParty}: 
-
+

<#-- ======================= Categories ======================== -->
${uiLabelMap.ProductActions} ${uiLabelMap.ProductCategories}:
<#assign actionProductPromoCategories = productPromoAction.getRelated("ProductPromoCategory")> @@ -251,7 +251,7 @@ <#list actionProductPromoCategories as actionProductPromoCategory> <#assign actionProductCategory = actionProductPromoCategory.getRelatedOneCache("ProductCategory")> <#assign actionApplEnumeration = actionProductPromoCategory.getRelatedOneCache("ApplEnumeration")> -
+

${(actionProductCategory.description)?if_exists} [${actionProductPromoCategory.productCategoryId}] - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoCategory.productPromoApplEnumId)} - ${uiLabelMap.ProductSubCats}? ${actionProductPromoCategory.includeSubCategories?default("N")} @@ -258,9 +258,9 @@ - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${actionProductPromoCategory.andGroupId} [${uiLabelMap.CommonDelete}] -

+

-
+

@@ -283,7 +283,7 @@ ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: *
-
+

<#-- ======================= Products ======================== -->
${uiLabelMap.ProductActions} ${uiLabelMap.ProductProducts}:
<#assign actionProductPromoProducts = productPromoAction.getRelated("ProductPromoProduct")> @@ -290,7 +290,7 @@ <#list actionProductPromoProducts as actionProductPromoProduct> <#assign actionProduct = actionProductPromoProduct.getRelatedOneCache("Product")?if_exists> <#assign actionApplEnumeration = actionProductPromoProduct.getRelatedOneCache("ApplEnumeration")> -
+

${(actionProduct.internalName)?if_exists} [${actionProductPromoProduct.productId}] - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoProduct.productPromoApplEnumId)} @@ -295,9 +295,9 @@ - ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoProduct.productPromoApplEnumId)} [${uiLabelMap.CommonDelete}] -

+

-
+

@@ -311,7 +311,7 @@
-
+

@@ -321,7 +321,7 @@
-
+

@@ -344,7 +344,7 @@ ${uiLabelMap.PartyParty}: 
-
+

@@ -352,13 +352,13 @@
-
${uiLabelMap.ProductNoteOnItemId} : ${uiLabelMap.ProductItemIdGiftPurchaseFreeShipping}
-
${uiLabelMap.ProductNoteOnPartyId} : ${uiLabelMap.ProductPartyFreeShipping}
+

${uiLabelMap.ProductNoteOnItemId} : ${uiLabelMap.ProductItemIdGiftPurchaseFreeShipping}

+

${uiLabelMap.ProductNoteOnPartyId} : ${uiLabelMap.ProductPartyFreeShipping}


-
${uiLabelMap.ProductAddPromoRule}:
-
+

${uiLabelMap.ProductAddPromoRule}:

+

${uiLabelMap.ProductName} : @@ -364,7 +364,7 @@ ${uiLabelMap.ProductName} :
-
+


@@ -369,11 +369,11 @@
<#-- ======================= Categories ======================== --> -
${uiLabelMap.ProductPromotion} ${uiLabelMap.ProductCategories}:
+

${uiLabelMap.ProductPromotion} ${uiLabelMap.ProductCategories}:

<#list promoProductPromoCategories as promoProductPromoCategory> <#assign promoProductCategory = promoProductPromoCategory.getRelatedOneCache("ProductCategory")> <#assign promoApplEnumeration = promoProductPromoCategory.getRelatedOneCache("ApplEnumeration")> -
+

${(promoProductCategory.description)?if_exists} [${promoProductPromoCategory.productCategoryId}] - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoCategory.productPromoApplEnumId)} - ${uiLabelMap.ProductSubCats}? ${promoProductPromoCategory.includeSubCategories?default("N")} @@ -380,9 +380,9 @@ - ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${promoProductPromoCategory.andGroupId} [${uiLabelMap.CommonDelete}] -

+

-
+

@@ -405,14 +405,14 @@ ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: *
-
+


<#-- ======================= Products ======================== --> -
${uiLabelMap.ProductPromotionProducts} :
+

${uiLabelMap.ProductPromotionProducts} :

<#list promoProductPromoProducts as promoProductPromoProduct> <#assign promoProduct = promoProductPromoProduct.getRelatedOneCache("Product")?if_exists> <#assign promoApplEnumeration = promoProductPromoProduct.getRelatedOneCache("ApplEnumeration")> -
+

${(promoProduct.internalName)?if_exists} [${promoProductPromoProduct.productId}] - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoProduct.productPromoApplEnumId)} @@ -417,9 +417,9 @@ - ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoProduct.productPromoApplEnumId)} [${uiLabelMap.CommonDelete}] -

+

-
+

@@ -433,5 +433,5 @@
-
+

Index: applications/product/webapp/catalog/promo/EditProductPromoStores.ftl =================================================================== --- applications/product/webapp/catalog/promo/EditProductPromoStores.ftl (revision 493251) +++ applications/product/webapp/catalog/promo/EditProductPromoStores.ftl (working copy) @@ -19,10 +19,10 @@ <#if productPromoId?exists && productPromo?exists> - - - - + + + + <#assign line = 0> <#list productStorePromoAppls as productStorePromoAppl> @@ -58,7 +58,7 @@ -
${uiLabelMap.ProductAddStorePromo} :
+

${uiLabelMap.ProductAddStorePromo} :


@@ -28,15 +28,15 @@ ${uiLabelMap.ProductPromotionCode}: - +


${uiLabelMap.ProductStoreNameId}
${uiLabelMap.CommonFromDateTime}
${uiLabelMap.ProductThruDateTimeSequence}
 

${uiLabelMap.ProductStoreNameId}

${uiLabelMap.CommonFromDateTime}

${uiLabelMap.ProductThruDateTimeSequence}

 
- - - - - + + + + + <#list productPromos as productPromo> Index: applications/product/webapp/catalog/promo/FindProductPromoCode.ftl =================================================================== --- applications/product/webapp/catalog/promo/FindProductPromoCode.ftl (revision 493251) +++ applications/product/webapp/catalog/promo/FindProductPromoCode.ftl (working copy) @@ -25,12 +25,12 @@
${uiLabelMap.ProductPromoNameId}
${uiLabelMap.ProductPromoText}
${uiLabelMap.ProductPromotionReqCode}?
${uiLabelMap.CommonCreated}
 

${uiLabelMap.ProductPromoNameId}

${uiLabelMap.ProductPromoText}

${uiLabelMap.ProductPromotionReqCode}?

${uiLabelMap.CommonCreated}

 
- - - - - - + + + + + + <#list productPromoCodes as productPromoCode> <#assign productPromo = productPromoCode.getRelatedOne("ProductPromo")> @@ -48,8 +48,8 @@
${uiLabelMap.ProductPromotionCode}
${uiLabelMap.ProductPromotionPerCode}
${uiLabelMap.ProductPromotionPerCustomer}
${uiLabelMap.ProductPromotionReqEmailOrParty}
${uiLabelMap.CommonCreated}
 

${uiLabelMap.ProductPromotionCode}

${uiLabelMap.ProductPromotionPerCode}

${uiLabelMap.ProductPromotionPerCustomer}

${uiLabelMap.ProductPromotionReqEmailOrParty}

${uiLabelMap.CommonCreated}

 

-
${uiLabelMap.ProductPromotionAddSetOfPromotionCodes}:
-
+

${uiLabelMap.ProductPromotionAddSetOfPromotionCodes}:

+

@@ -60,6 +60,6 @@ ${uiLabelMap.ProductPromotionPerCustomer}
-
+

Index: applications/product/webapp/catalog/reviews/pendingReviews.ftl =================================================================== --- applications/product/webapp/catalog/reviews/pendingReviews.ftl (revision 493251) +++ applications/product/webapp/catalog/reviews/pendingReviews.ftl (working copy) @@ -15,11 +15,11 @@ under the License. --> -
${uiLabelMap.ProductReviewsPendingApproval}
+

${uiLabelMap.ProductReviewsPendingApproval}


<#if !pendingReviews?has_content> -
${uiLabelMap.CommonNo} ${uiLabelMap.ProductReviewsPendingApproval}
+

${uiLabelMap.CommonNo} ${uiLabelMap.ProductReviewsPendingApproval}

<#list pendingReviews as review> @@ -33,11 +33,11 @@
${uiLabelMap.CommonPostedDate}:
${review.postedDateTime?if_exists}

${review.postedDateTime?if_exists}
${uiLabelMap.CommonPostedBy}:
-
${postedPerson.firstName} ${postedPerson.lastName}

${postedPerson.firstName} ${postedPerson.lastName}
${uiLabelMap.ProductRating}:
@@ -48,7 +48,7 @@
${uiLabelMap.CommonIsAnonymous}:
 -
+

-

+

${uiLabelMap.CommonStatus}:
 -
+

-

+

${uiLabelMap.ProductServiceName}
${uiLabelMap.AccountingPaymentProps}
${uiLabelMap.ApplyToAll}
 

 
${payMeth.get("description",locale)}
${enum.get("description",locale)}
${setting.paymentService?default("${uiLabelMap.CommonNA}")}
${setting.paymentPropertiesPath?default("[${uiLabelMap.ProductGlobal}]")}
${setting.applyToAllProducts?if_exists}

${payMeth.get("description",locale)}

${enum.get("description",locale)}

${setting.paymentService?default("${uiLabelMap.CommonNA}")}

${setting.paymentPropertiesPath?default("[${uiLabelMap.ProductGlobal}]")}

${setting.applyToAllProducts?if_exists}

 -
<#if security.hasEntityPermission("CATALOG", "_DELETE", session)>[${uiLabelMap.CommonDelete}] [${uiLabelMap.CommonEdit}]
+

<#if security.hasEntityPermission("CATALOG", "_DELETE", session)>[${uiLabelMap.CommonDelete}] [${uiLabelMap.CommonEdit}]
Index: applications/product/webapp/catalog/store/EditProductStorePromos.ftl =================================================================== --- applications/product/webapp/catalog/store/EditProductStorePromos.ftl (revision 493251) +++ applications/product/webapp/catalog/store/EditProductStorePromos.ftl (working copy) @@ -25,11 +25,11 @@ [${uiLabelMap.CommonUserEnteredOnly}]
-
${uiLabelMap.CommonShow} +

${uiLabelMap.CommonShow} <#if activeOnly>${uiLabelMap.CommonActiveOnly}<#else>${uiLabelMap.CommonActiveInactive} ${uiLabelMap.CommonAnd} <#if userEntered>${uiLabelMap.CommonUserEnteredOnly}<#else>${uiLabelMap.CommonUserAutoEntered} -

+ <#if productStoreId?exists && productStore?exists> <#if (listSize > 0)> @@ -54,10 +54,10 @@ - - - - + + + + <#if (listSize > 0)> <#assign line = 0> @@ -114,7 +114,7 @@ -
${uiLabelMap.ProductAddStorePromoOptionalDate}:
+

${uiLabelMap.ProductAddStorePromoOptionalDate}:


${uiLabelMap.ProductPromoNameId}
${uiLabelMap.CommonFromDateTime}
${uiLabelMap.ProductThruDateTimeSequence}
 

${uiLabelMap.ProductPromoNameId}

${uiLabelMap.CommonFromDateTime}

${uiLabelMap.ProductThruDateTimeSequence}

 

-
${uiLabelMap.ProductCreateProductStoreRole}:
+

${uiLabelMap.ProductCreateProductStoreRole}:

@@ -80,7 +80,7 @@ - +
 
Index: applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl =================================================================== --- applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl (revision 493251) +++ applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl (working copy) @@ -82,16 +82,16 @@ <#assign quantityValue = estimate.getRelatedOne("QuantityQuantityBreak")?if_exists> <#assign priceValue = estimate.getRelatedOne("PriceQuantityBreak")?if_exists>
${estimate.shipmentCostEstimateId}
${estimate.shipmentMethodTypeId} (${estimate.carrierPartyId})
${estimate.geoIdTo?default("${uiLabelMap.CommonAll}")}
${estimate.partyId?default("${uiLabelMap.CommonAll}")}
${estimate.roleTypeId?default("${uiLabelMap.CommonAll}")}
${estimate.orderPricePercent?default(0)?string.number}%
${estimate.orderFlatPrice?default(0)}
${estimate.orderItemFlatPrice?default(0)}

${estimate.shipmentCostEstimateId}

${estimate.shipmentMethodTypeId} (${estimate.carrierPartyId})

${estimate.geoIdTo?default("${uiLabelMap.CommonAll}")}

${estimate.partyId?default("${uiLabelMap.CommonAll}")}

${estimate.roleTypeId?default("${uiLabelMap.CommonAll}")}

${estimate.orderPricePercent?default(0)?string.number}%

${estimate.orderFlatPrice?default(0)}

${estimate.orderItemFlatPrice?default(0)}

 -
<#if security.hasEntityPermission("SHIPRATE", "_DELETE", session)>[${uiLabelMap.CommonDelete}] [${uiLabelMap.CommonView}]
+

<#if security.hasEntityPermission("SHIPRATE", "_DELETE", session)>[${uiLabelMap.CommonDelete}] [${uiLabelMap.CommonView}]
- +
@@ -471,7 +471,7 @@ <#-- New Shippment Methods--> <#if requestParameters.newShipMethod?exists> -
${uiLabelMap.ProductStoreShipmentMethodAssociations}
+

${uiLabelMap.ProductStoreShipmentMethodAssociations}

@@ -713,7 +713,7 @@ @@ -720,7 +720,7 @@
${uiLabelMap.ProductShipmentMethodType}
- +

-
${uiLabelMap.ProductShipmentMethodType} :
+

${uiLabelMap.ProductShipmentMethodType} :

@@ -733,7 +733,7 @@ - + @@ -751,7 +751,7 @@ @@ -764,7 +764,7 @@ @@ -772,7 +772,7 @@
-
${uiLabelMap.ProductCarrierShipmentMethod} :
+

${uiLabelMap.ProductCarrierShipmentMethod} :

${uiLabelMap.ProductShipmentMethodType} <#if shipmentMethodType?has_content> -
${shipmentMethodType.shipmentMethodTypeId}
+

${shipmentMethodType.shipmentMethodTypeId}

<#else> *
- +
@@ -786,7 +786,7 @@ - + @@ -806,7 +806,7 @@ Index: applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl =================================================================== --- applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl (revision 493251) +++ applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl (working copy) @@ -42,7 +42,7 @@
<#if carrierShipmentMethod?has_content> -
${carrierShipmentMethod.shipmentMethodTypeId}
+

${carrierShipmentMethod.shipmentMethodTypeId}

<#else> 		<#if carrierShipmentMethod?has_content> -
${carrierShipmentMethod.roleTypeId}
+

${carrierShipmentMethod.roleTypeId}

<#else> 		<#if carrierShipmentMethod?has_content> -
${carrierShipmentMethod.partyId}
+

${carrierShipmentMethod.partyId}

<#else> * @@ -855,7 +855,7 @@
- +

-
${uiLabelMap.PageTitleEditProductStoreSurveys}:
+

${uiLabelMap.PageTitleEditProductStoreSurveys}:

@@ -123,7 +123,7 @@ - +
 
Index: applications/product/webapp/catalog/store/EditProductStoreTaxSetup.ftl =================================================================== --- applications/product/webapp/catalog/store/EditProductStoreTaxSetup.ftl (revision 493251) +++ applications/product/webapp/catalog/store/EditProductStoreTaxSetup.ftl (working copy) @@ -23,19 +23,19 @@
${uiLabelMap.ProductMinPurchase}
${uiLabelMap.ProductTaxRate}
${uiLabelMap.CommonFromDate}
 

 
${taxItem.countryGeoId}
${taxItem.stateProvinceGeoId}
${taxItem.taxCategory}
${taxItem.minItemPrice?string("##0.00")}
${taxItem.minPurchase?string("##0.00")}
${taxItem.salesTaxPercentage?if_exists}
${taxItem.fromDate?string}

${taxItem.countryGeoId}

${taxItem.stateProvinceGeoId}

${taxItem.taxCategory}

${taxItem.minItemPrice?string("##0.00")}

${taxItem.minPurchase?string("##0.00")}

${taxItem.salesTaxPercentage?if_exists}

${taxItem.fromDate?string}

[${uiLabelMap.CommonDelete}]

[${uiLabelMap.CommonDelete}]

  Calendar

-
${uiLabelMap.ProductSetStoreOnWebSite}:
+

${uiLabelMap.ProductSetStoreOnWebSite}:

@@ -45,5 +45,5 @@ - +
Index: applications/product/webapp/catalog/store/FindProductStore.ftl =================================================================== --- applications/product/webapp/catalog/store/FindProductStore.ftl (revision 493251) +++ applications/product/webapp/catalog/store/FindProductStore.ftl (working copy) @@ -14,7 +14,7 @@ License for the specific language governing permissions and limitations under the License. --> -
${uiLabelMap.ProductProductStoreList}
+

${uiLabelMap.ProductProductStoreList}


@@ -19,16 +19,16 @@
- - - - + + + + <#list productStores as productStore> - - - + + + Index: applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl =================================================================== --- applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl (revision 493251) +++ applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl (working copy) @@ -14,9 +14,9 @@ License for the specific language governing permissions and limitations under the License. --> -
${uiLabelMap.ProductAlternateKeyWordThesaurus}
+

${uiLabelMap.ProductAlternateKeyWordThesaurus}

-
+

${uiLabelMap.ProductKeyword} : ${uiLabelMap.ProductAlternate} : ${uiLabelMap.ProductRelationship} : @@ -21,10 +21,10 @@ ${uiLabelMap.ProductAlternate} : ${uiLabelMap.ProductRelationship} : -

+

-
+

<#list letterList as letter> <#if letter == firstLetter><#assign highlight=true><#else><#assign highlight=false> <#if highlight>[[${letter}]<#if highlight>] @@ -29,7 +29,7 @@ <#if letter == firstLetter><#assign highlight=true><#else><#assign highlight=false> <#if highlight>[[${letter}]<#if highlight>] -

+


<#assign lastkeyword = ""> @@ -45,11 +45,11 @@ Index: applications/product/webapp/facility/facility/EditContactMech.ftl =================================================================== --- applications/product/webapp/facility/facility/EditContactMech.ftl (revision 493251) +++ applications/product/webapp/facility/facility/EditContactMech.ftl (working copy) @@ -28,7 +28,7 @@
${uiLabelMap.ProductStoreNameId}
${uiLabelMap.ProductTitle}
${uiLabelMap.ProductSubTitle}
 

${uiLabelMap.ProductStoreNameId}

${uiLabelMap.ProductTitle}

${uiLabelMap.ProductSubTitle}

 
 ${productStore.storeName?if_exists} [${productStore.productStoreId}]
 ${productStore.title?if_exists}
 ${productStore.subtitle?if_exists}

 ${productStore.storeName?if_exists} [${productStore.productStoreId}]

 ${productStore.title?if_exists}

 ${productStore.subtitle?if_exists}

 [${uiLabelMap.CommonEdit}]
-
+

${keyword.enteredKeyword} [${uiLabelMap.CommonDeleteAll}] -

-
+

+

${uiLabelMap.ProductAlternate} : ${uiLabelMap.ProductRelationship} : @@ -54,7 +54,7 @@ ${uiLabelMap.ProductAlternate} : ${uiLabelMap.ProductRelationship} : -

+

@@ -59,10 +59,10 @@ -
+

[X] ${keyword.alternateKeyword} (${uiLabelMap.ProductRelationship}:${(relationship.get("description",locale))?default(keyword.relationshipEnumId?if_exists)}) -

+

- + - - - - + + + + <#list orderShipments as orderShipment> - - - - - - + + + + + + <#list itemIssuances as itemIssuance> @@ -49,12 +49,12 @@ <#list itemIssuances as itemIssuance> - - - - - - + + + + + + <#list shipmentPackageContents as shipmentPackageContent> @@ -59,10 +59,10 @@ <#list shipmentPackageContents as shipmentPackageContent> - - - - + + + + Index: applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl =================================================================== --- applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl (revision 493251) +++ applications/product/webapp/facility/shipment/ViewShipmentPackageInfo.ftl (working copy) @@ -29,8 +29,8 @@ <#assign shipmentPackageRouteSegs = shipmentPackageData.shipmentPackageRouteSegs?if_exists> <#assign weightUom = shipmentPackageData.weightUom?if_exists> - - + + @@ -36,10 +36,10 @@ <#list shipmentPackageContents as shipmentPackageContent> - - - - + + + + <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> @@ -44,8 +44,8 @@ <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> - - + + Index: applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl =================================================================== --- applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl (revision 493251) +++ applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl (working copy) @@ -57,7 +57,7 @@ <#assign billingWeightUom = shipmentRouteSegmentData.billingWeightUom?if_exists> <#assign carrierServiceStatusValidChangeToDetails = shipmentRouteSegmentData.carrierServiceStatusValidChangeToDetails?if_exists> - + <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> @@ -100,8 +100,8 @@ <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> - - + +
${uiLabelMap.PartySelectContactType}:

${uiLabelMap.PartySelectContactType}:

 <#if mechMap.purposeTypes?has_content> - + Index: applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl =================================================================== --- applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl (revision 493251) +++ applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl (working copy) @@ -41,4 +41,4 @@ //--> - + Index: applications/product/webapp/facility/group/EditFacilityGroup.ftl =================================================================== --- applications/product/webapp/facility/group/EditFacilityGroup.ftl (revision 493251) +++ applications/product/webapp/facility/group/EditFacilityGroup.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductFacilityGroup} <#if facilityGroup?exists>${(facilityGroup.facilityGroupName)?if_exists} [${uiLabelMap.CommonId}:${facilityGroupId?if_exists}]
+

${uiLabelMap.ProductFacilityGroup} <#if facilityGroup?exists>${(facilityGroup.facilityGroupName)?if_exists} [${uiLabelMap.CommonId}:${facilityGroupId?if_exists}]

[${uiLabelMap.ProductNewGroup}] <#if !(facilityGroup?exists)> @@ -32,7 +32,7 @@
${uiLabelMap.PartyContactPurposes}

${uiLabelMap.PartyContactPurposes}

   @@ -75,7 +75,7 @@ <#assign contactMechPurposeType = facilityContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> +  

@@ -116,7 +116,7 @@ <#if "POSTAL_ADDRESS" = mechMap.contactMechTypeId?if_exists> - + - + - + - + - + - + - + - + <#elseif "TELECOM_NUMBER" = mechMap.contactMechTypeId?if_exists> - + - + - + <#elseif "EMAIL_ADDRESS" = mechMap.contactMechTypeId?if_exists> - + <#else> - + <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)> @@ -124,7 +124,7 @@
-
  +

  <#if contactMechPurposeType?has_content> ${contactMechPurposeType.get("description",locale)} <#else> @@ -83,7 +83,7 @@ (${uiLabelMap.CommonSince}:${facilityContactMechPurpose.fromDate.toString()}) <#if facilityContactMechPurpose.thruDate?has_content>(${uiLabelMap.CommonExpires}: ${facilityContactMechPurpose.thruDate.toString()} -  
${uiLabelMap.PartyToName}

${uiLabelMap.PartyToName}

   @@ -123,7 +123,7 @@
${uiLabelMap.PartyAttentionName}

${uiLabelMap.PartyAttentionName}

   @@ -130,7 +130,7 @@
${uiLabelMap.PartyAddressLine1}

${uiLabelMap.PartyAddressLine1}

   @@ -137,7 +137,7 @@ *
${uiLabelMap.PartyAddressLine2}

${uiLabelMap.PartyAddressLine2}

   @@ -144,7 +144,7 @@
${uiLabelMap.PartyCity}

${uiLabelMap.PartyCity}

   @@ -151,7 +151,7 @@ *
${uiLabelMap.PartyState}

${uiLabelMap.PartyState}

  
${uiLabelMap.PartyZipCode}

${uiLabelMap.PartyZipCode}

   @@ -169,7 +169,7 @@ *
${uiLabelMap.PartyCountry}

${uiLabelMap.PartyCountry}

  
${uiLabelMap.PartyPhoneNumber}

${uiLabelMap.PartyPhoneNumber}

   @@ -191,13 +191,13 @@

 
[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]

[${uiLabelMap.PartyCountryCode}] [${uiLabelMap.PartyAreaCode}] [${uiLabelMap.PartyContactNumber}] [${uiLabelMap.PartyExtension}]
${uiLabelMap.PartyEmailAddress}

${uiLabelMap.PartyEmailAddress}

   @@ -205,7 +205,7 @@
${mechMap.contactMechType.get("description",locale)}

${mechMap.contactMechType.get("description",locale)}

   Index: applications/product/webapp/facility/facility/EditFacility.ftl =================================================================== --- applications/product/webapp/facility/facility/EditFacility.ftl (revision 493251) +++ applications/product/webapp/facility/facility/EditFacility.ftl (working copy) @@ -17,7 +17,7 @@ <#if security.hasEntityPermission("FACILITY", "_VIEW", session)> -
${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]
+

${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]

${uiLabelMap.ProductNewFacility} <#if facilityId?has_content> ${uiLabelMap.CommonViewCalendar} @@ -28,7 +28,7 @@ - + - + - + - + - + - + @@ -105,7 +105,7 @@ - + @@ -110,7 +110,7 @@ - + Index: applications/product/webapp/facility/facility/EditFacilityGroups.ftl =================================================================== --- applications/product/webapp/facility/facility/EditFacilityGroups.ftl (revision 493251) +++ applications/product/webapp/facility/facility/EditFacilityGroups.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductGroupsFor} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]
+

${uiLabelMap.ProductGroupsFor} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]

[${uiLabelMap.ProductNewFacility}] <#if activeOnly> [${uiLabelMap.ProductActiveAndInactive}] @@ -50,10 +50,10 @@
${uiLabelMap.ProductFacilityId}

${uiLabelMap.ProductFacilityId}

   ${facilityId?if_exists} (${uiLabelMap.ProductNotModificationRecrationFacility}.) @@ -42,7 +42,7 @@
${uiLabelMap.ProductFacilityTypeId}

${uiLabelMap.ProductFacilityTypeId}

  
${uiLabelMap.ProductFacilityOwner}

${uiLabelMap.ProductFacilityOwner}

  
${uiLabelMap.ProductFacilityDefaultWeightUnit}

${uiLabelMap.ProductFacilityDefaultWeightUnit}

  
${uiLabelMap.ProductFacilityDefaultInventoryItemType}

${uiLabelMap.ProductFacilityDefaultInventoryItemType}

  
${uiLabelMap.ProductName}

${uiLabelMap.ProductName}

  
${uiLabelMap.ProductSquareFootage}

${uiLabelMap.ProductSquareFootage}

  
${uiLabelMap.ProductDescription}

${uiLabelMap.ProductDescription}

  
- - - - + + + + <#if (facilityGroupMembers.size() > 0)> <#assign line = 0> @@ -118,8 +118,8 @@ -
${uiLabelMap.ProductAddFacilityGroupMember}:
-
+

${uiLabelMap.ProductAddFacilityGroupMember}:

+

${uiLabelMap.ProductFacilityGroup} ${uiLabelMap.CommonId}: Calendar -

+

-
${uiLabelMap.ProductLocationFor} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]
+

${uiLabelMap.ProductLocationFor} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]

[${uiLabelMap.ProductNewFacility}][${uiLabelMap.ProductNewFacilityLocation}] <#if facilityId?exists && locationSeqId?exists> @@ -32,7 +32,7 @@ - + - + <#else> -
${uiLabelMap.ProductNotCreateLocationFacilityId}
+

${uiLabelMap.ProductNotCreateLocationFacilityId}

<#if facilityId?exists> @@ -51,7 +51,7 @@ <#if facilityId?exists> - + - + @@ -72,7 +72,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -101,12 +101,12 @@
<#-- ProductFacilityLocation stuff --> -
${uiLabelMap.ProductLocationProduct}:
+

${uiLabelMap.ProductLocationProduct}:

${uiLabelMap.ProductFacilityGroupNameId}
${uiLabelMap.CommonFromDateTime}
${uiLabelMap.ProductThruDateTimeSequence}
 

${uiLabelMap.ProductFacilityGroupNameId}

${uiLabelMap.CommonFromDateTime}

${uiLabelMap.ProductThruDateTimeSequence}

 
${uiLabelMap.ProductFacilityId}

${uiLabelMap.ProductFacilityId}

   ${facilityId?if_exists} @@ -39,7 +39,7 @@
${uiLabelMap.ProductLocationSeqId}

${uiLabelMap.ProductLocationSeqId}

   ${locationSeqId} @@ -46,7 +46,7 @@
${uiLabelMap.ProductType}

${uiLabelMap.ProductType}

  
${uiLabelMap.CommonArea}

${uiLabelMap.CommonArea}

  
${uiLabelMap.ProductAisle}

${uiLabelMap.ProductAisle}

  
${uiLabelMap.ProductSection}

${uiLabelMap.ProductSection}

  
${uiLabelMap.ProductLevel}

${uiLabelMap.ProductLevel}

  
${uiLabelMap.ProductPosition}

${uiLabelMap.ProductPosition}

  
- - - + + + <#list productFacilityLocations?if_exists as productFacilityLocation> <#assign product = productFacilityLocation.getRelatedOne("Product")?if_exists> @@ -111,7 +111,7 @@ <#list productFacilityLocations?if_exists as productFacilityLocation> <#assign product = productFacilityLocation.getRelatedOne("Product")?if_exists> - + - - - + + + @@ -69,11 +69,11 @@ <#assign orderReadyToPickInfoListSizeTotal = orderReadyToPickInfoListSizeTotal + orderReadyToPickInfoListSize> <#assign orderNeedsStockMoveInfoListSizeTotal = orderNeedsStockMoveInfoListSizeTotal + orderNeedsStockMoveInfoListSize> - - - + + + @@ -93,7 +93,7 @@ <#else> - +
${uiLabelMap.ProductProduct}
${uiLabelMap.ProductMinimumStockAndMoveQuantity}
 

${uiLabelMap.ProductProduct}

${uiLabelMap.ProductMinimumStockAndMoveQuantity}

 
<#if product?exists>${(product.internalName)?if_exists}[${productFacilityLocation.productId}]

<#if product?exists>${(product.internalName)?if_exists}[${productFacilityLocation.productId}]
@@ -134,8 +134,8 @@ -
${uiLabelMap.ProductAddProduct}:
-
+

${uiLabelMap.ProductAddProduct}:

+

${uiLabelMap.ProductProductId}:  ${uiLabelMap.ProductMinimumStock}:  ${uiLabelMap.ProductMoveQuantity}:  @@ -140,6 +140,6 @@ ${uiLabelMap.ProductMinimumStock}:  ${uiLabelMap.ProductMoveQuantity}:  -

+

Index: applications/product/webapp/facility/facility/EditFacilityRoles.ftl =================================================================== --- applications/product/webapp/facility/facility/EditFacilityRoles.ftl (revision 493251) +++ applications/product/webapp/facility/facility/EditFacilityRoles.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.PartyRoleFor} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]
+

${uiLabelMap.PartyRoleFor} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]

[${uiLabelMap.ProductNewFacility}]

@@ -22,9 +22,9 @@

${uiLabelMap.ProductFacilityRoleMemberMaintenance}

- - - + + + <#list facilityRoles as facilityRole> @@ -31,7 +31,7 @@ <#assign roleType = facilityRole.getRelatedOne("RoleType")> - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + <#else> - + <#assign messageCount = 0> <#list pflWarningMessageList?if_exists as pflWarningMessage> @@ -125,7 +125,7 @@ <#assign messageCount = 0> <#list pflWarningMessageList?if_exists as pflWarningMessage> <#assign messageCount = messageCount + 1> - +
${uiLabelMap.PartyPartyId}
${uiLabelMap.PartyRoleType}
 

${uiLabelMap.PartyPartyId}

${uiLabelMap.PartyRoleType}

 
${(facilityRole.partyId)?if_exists}
${(roleType.get("description",locale))?if_exists}

${(roleType.get("description",locale))?if_exists}

 [${uiLabelMap.CommonDelete}] @@ -43,8 +43,8 @@
-
${uiLabelMap.ProductAddFacilityPartyRole}:
-
+

${uiLabelMap.ProductAddFacilityPartyRole}:

+

${uiLabelMap.PartyPartyId}: ${uiLabelMap.PartyRoleType}: -

+

Index: applications/product/webapp/facility/facility/FindFacility.ftl =================================================================== --- applications/product/webapp/facility/facility/FindFacility.ftl (revision 493251) +++ applications/product/webapp/facility/facility/FindFacility.ftl (working copy) @@ -17,7 +17,7 @@ <#if security.hasEntityPermission("FACILITY", "_VIEW", session)> -
${uiLabelMap.ProductFacilitiesList}
+

${uiLabelMap.ProductFacilitiesList}


@@ -23,12 +23,12 @@
- - - - - - + + + + + + <#list facilities as facility> <#assign facilityType = facility.getRelatedOne("FacilityType")?if_exists> Index: applications/product/webapp/facility/facility/FindFacilityLocation.ftl =================================================================== --- applications/product/webapp/facility/facility/FindFacilityLocation.ftl (revision 493251) +++ applications/product/webapp/facility/facility/FindFacilityLocation.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductFindLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]
+

${uiLabelMap.ProductFindLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]

[${uiLabelMap.ProductNewFacility}][${uiLabelMap.ProductNewFacilityLocation}] @@ -23,7 +23,7 @@
${uiLabelMap.ProductFacilityNameId}
${uiLabelMap.ProductFacilityType}
${uiLabelMap.ProductFacilityOwner}
${uiLabelMap.ProductSqFt}
${uiLabelMap.ProductDescription}
 

${uiLabelMap.ProductFacilityNameId}

${uiLabelMap.ProductFacilityType}

${uiLabelMap.ProductFacilityOwner}

${uiLabelMap.ProductSqFt}

${uiLabelMap.ProductDescription}

 
<#if !(facilityId?exists)> - + @@ -31,7 +31,7 @@ - + - + @@ -49,7 +49,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -80,14 +80,14 @@ ${uiLabelMap.CommonFound}: ${foundLocations.size()} ${uiLabelMap.ProductLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists} [ID:${facilityId?if_exists}]
${uiLabelMap.ProductFacility}

${uiLabelMap.ProductFacility}

  
${uiLabelMap.ProductLocationSeqId}

${uiLabelMap.ProductLocationSeqId}

   @@ -44,7 +44,7 @@
${uiLabelMap.CommonArea}

${uiLabelMap.CommonArea}

  
${uiLabelMap.ProductAisle}

${uiLabelMap.ProductAisle}

  
${uiLabelMap.ProductSection}

${uiLabelMap.ProductSection}

  
${uiLabelMap.ProductLevel}

${uiLabelMap.ProductLevel}

  
${uiLabelMap.ProductPosition}

${uiLabelMap.ProductPosition}

  
- - - - - - - - + + + + + + + + <#if itemId?exists> @@ -97,14 +97,14 @@ <#list foundLocations as location> <#assign locationTypeEnum = location.getRelatedOneCache("TypeEnumeration")?if_exists> - - - - - - - - + + + + + + + + Index: applications/product/webapp/facility/facility/FindFacilityTransfers.ftl =================================================================== --- applications/product/webapp/facility/facility/FindFacilityTransfers.ftl (revision 493251) +++ applications/product/webapp/facility/facility/FindFacilityTransfers.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductInventoryTransfersFor} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]
+

${uiLabelMap.ProductInventoryTransfersFor} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]

[${uiLabelMap.ProductNewFacility}] <#if activeOnly> [${uiLabelMap.ProductActiveAndInactive}] @@ -27,14 +27,14 @@
<#if (toTransfers.size() > 0)>
-
${uiLabelMap.CommonTo}: <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]
+

${uiLabelMap.CommonTo}: <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]

${uiLabelMap.ProductFacility}
${uiLabelMap.ProductLocationSeqId}
${uiLabelMap.ProductType}
${uiLabelMap.CommonArea}
${uiLabelMap.ProductAisle}
${uiLabelMap.ProductSection}
${uiLabelMap.ProductLevel}
${uiLabelMap.ProductPosition}

${uiLabelMap.ProductFacility}

${uiLabelMap.ProductLocationSeqId}

${uiLabelMap.ProductType}

${uiLabelMap.CommonArea}

${uiLabelMap.ProductAisle}

${uiLabelMap.ProductSection}

${uiLabelMap.ProductLevel}

${uiLabelMap.ProductPosition}

    
 ${(location.facilityId)?if_exists}
 ${(location.locationSeqId)?if_exists}
 ${(locationTypeEnum.get("description",locale))?default(location.locationTypeEnumId?if_exists)}
 ${(location.areaId)?if_exists}
 ${(location.aisleId)?if_exists}
 ${(location.sectionId)?if_exists}
 ${(location.levelId)?if_exists}
 ${(location.positionId)?if_exists}

 ${(location.facilityId)?if_exists}

 ${(location.locationSeqId)?if_exists}

 ${(locationTypeEnum.get("description",locale))?default(location.locationTypeEnumId?if_exists)}

 ${(location.areaId)?if_exists}

 ${(location.aisleId)?if_exists}

 ${(location.sectionId)?if_exists}

 ${(location.levelId)?if_exists}

 ${(location.positionId)?if_exists}

 [${uiLabelMap.ProductNewInventoryItem}]
- - - - - + + + + + @@ -40,20 +40,20 @@ <#list toTransfers as transfer> - - + + - + - +
${uiLabelMap.ProductTransferId}
${uiLabelMap.ProductItem}
${uiLabelMap.CommonFrom}
${uiLabelMap.CommonSendDate}
${uiLabelMap.CommonStatus}

${uiLabelMap.ProductTransferId}

${uiLabelMap.ProductItem}

${uiLabelMap.CommonFrom}

${uiLabelMap.CommonSendDate}

${uiLabelMap.CommonStatus}

  
 ${(transfer.inventoryTransferId)?if_exists}
 ${(transfer.inventoryItemId)?if_exists}

 ${(transfer.inventoryTransferId)?if_exists}

 ${(transfer.inventoryItemId)?if_exists}

 <#assign fac = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", transfer.getString("facilityId")))> -
 <#if fac?exists>${(fac.facilityName)?if_exists} [${(transfer.facilityId)?if_exists}]
+

 <#if fac?exists>${(fac.facilityName)?if_exists} [${(transfer.facilityId)?if_exists}]

 ${(transfer.sendDate)?if_exists}

 ${(transfer.sendDate)?if_exists}

 <#if (transfer.statusId)?exists> <#assign transferStatus = delegator.findByPrimaryKey("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", transfer.statusId))> -
 ${(transferStatus.get("description",locale))?if_exists}
+

 ${(transferStatus.get("description",locale))?if_exists}

[${uiLabelMap.CommonEdit}]

[${uiLabelMap.CommonEdit}]
@@ -61,14 +61,14 @@ <#if (fromTransfers.size() > 0)>
-
${uiLabelMap.CommonFrom}: <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]
+

${uiLabelMap.CommonFrom}: <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]

- - - - - + + + + + @@ -74,20 +74,20 @@ <#list fromTransfers as transfer> - - + + - + - +
${uiLabelMap.ProductTransferId}
${uiLabelMap.ProductItem}
${uiLabelMap.CommonTo}
${uiLabelMap.CommonSendDate}
${uiLabelMap.CommonStatus}

${uiLabelMap.ProductTransferId}

${uiLabelMap.ProductItem}

${uiLabelMap.CommonTo}

${uiLabelMap.CommonSendDate}

${uiLabelMap.CommonStatus}

  
 ${(transfer.inventoryTransferId)?if_exists}
 ${(transfer.inventoryItemId)?if_exists}

 ${(transfer.inventoryTransferId)?if_exists}

 ${(transfer.inventoryItemId)?if_exists}

 <#assign fac = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", transfer.getString("facilityIdTo")))> -
 <#if fac?exists>${(fac.facilityName)?if_exists} [${(transfer.facilityIdTo)?if_exists}]
+

 <#if fac?exists>${(fac.facilityName)?if_exists} [${(transfer.facilityIdTo)?if_exists}]

 ${(transfer.sendDate)?if_exists}

 ${(transfer.sendDate)?if_exists}

 <#if (transfer.statusId)?exists> <#assign transferStatus = delegator.findByPrimaryKey("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", transfer.statusId))> -
 ${(transferStatus.get("description",locale))?if_exists}
+

 ${(transferStatus.get("description",locale))?if_exists}

[${uiLabelMap.CommonEdit}]

[${uiLabelMap.CommonEdit}]
Index: applications/product/webapp/facility/facility/PickMoveStock.ftl =================================================================== --- applications/product/webapp/facility/facility/PickMoveStock.ftl (revision 493251) +++ applications/product/webapp/facility/facility/PickMoveStock.ftl (working copy) @@ -59,16 +59,16 @@ <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOneCache("TypeEnumeration"))?if_exists> <#assign totalQuantity = moveByOisgirInfo.totalQuantity>
${product.productId}
${product.internalName?if_exists}
${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})[${facilityLocationFrom.locationSeqId}]
${moveByOisgirInfo.quantityOnHandTotalFrom?if_exists}
${moveByOisgirInfo.availableToPromiseTotalFrom?if_exists}
${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})[${facilityLocationTo.locationSeqId}]
${moveByOisgirInfo.quantityOnHandTotalTo?if_exists}
${moveByOisgirInfo.availableToPromiseTotalTo?if_exists}
${targetProductFacilityLocation.minimumStock?if_exists}
${targetProductFacilityLocation.moveQuantity?if_exists}

${product.productId}

${product.internalName?if_exists}

${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})[${facilityLocationFrom.locationSeqId}]

${moveByOisgirInfo.quantityOnHandTotalFrom?if_exists}

${moveByOisgirInfo.availableToPromiseTotalFrom?if_exists}

${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})[${facilityLocationTo.locationSeqId}]

${moveByOisgirInfo.quantityOnHandTotalTo?if_exists}

${moveByOisgirInfo.availableToPromiseTotalTo?if_exists}

${targetProductFacilityLocation.minimumStock?if_exists}

${targetProductFacilityLocation.moveQuantity?if_exists}

 @@ -91,16 +91,16 @@ <#assign facilityLocationTypeEnumTo = (facilityLocationTo.getRelatedOneCache("TypeEnumeration"))?if_exists> <#assign totalQuantity = moveByPflInfo.totalQuantity>
${product.productId}
${product.internalName?if_exists}
${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})[${facilityLocationFrom.locationSeqId}]
${moveByPflInfo.quantityOnHandTotalFrom?if_exists}
${moveByPflInfo.availableToPromiseTotalFrom?if_exists}
${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})[${facilityLocationTo.locationSeqId}]
${moveByPflInfo.quantityOnHandTotalTo?if_exists}
${moveByPflInfo.availableToPromiseTotalTo?if_exists}
${targetProductFacilityLocation.minimumStock?if_exists}
${targetProductFacilityLocation.moveQuantity?if_exists}

${product.productId}

${product.internalName?if_exists}

${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})[${facilityLocationFrom.locationSeqId}]

${moveByPflInfo.quantityOnHandTotalFrom?if_exists}

${moveByPflInfo.availableToPromiseTotalFrom?if_exists}

${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})[${facilityLocationTo.locationSeqId}]

${moveByPflInfo.quantityOnHandTotalTo?if_exists}

${moveByPflInfo.availableToPromiseTotalTo?if_exists}

${targetProductFacilityLocation.minimumStock?if_exists}

${targetProductFacilityLocation.moveQuantity?if_exists}

 @@ -120,7 +120,7 @@
${uiLabelMap.ProductNoStockMovesNeeded}.

${uiLabelMap.ProductNoStockMovesNeeded}.

${messageCount}:${pflWarningMessage}.

${messageCount}:${pflWarningMessage}.

Index: applications/product/webapp/facility/facility/PicklistManage.ftl =================================================================== --- applications/product/webapp/facility/facility/PicklistManage.ftl (revision 493251) +++ applications/product/webapp/facility/facility/PicklistManage.ftl (working copy) @@ -30,7 +30,7 @@ <#assign picklist = picklistInfo.picklist> <#-- Picklist --> -
+

${uiLabelMap.ProductPickList} ${picklist.picklistId} ${uiLabelMap.CommonDate} ${picklist.picklistDate}

@@ -47,7 +47,7 @@
${uiLabelMap.ProductCreatedByUserLogin}/${uiLabelMap.ProductLastModifiedByUserLogin} ${picklist.createdByUserLogin}/${picklist.lastModifiedByUserLogin} [${uiLabelMap.ProductPick}/${uiLabelMap.ProductPacking} ${uiLabelMap.CommonReports}] -
+

<#if picklistInfo.shipmentMethodType?has_content>
${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentMethodType} ${picklistInfo.shipmentMethodType.description?default(picklistInfo.shipmentMethodType.shipmentMethodTypeId)} @@ -146,7 +146,7 @@ <#else/> -
${uiLabelMap.ProductNoPicksStarted}.
+

${uiLabelMap.ProductNoPicksStarted}.

Index: applications/product/webapp/facility/facility/PicklistOptions.ftl =================================================================== --- applications/product/webapp/facility/facility/PicklistOptions.ftl (revision 493251) +++ applications/product/webapp/facility/facility/PicklistOptions.ftl (working copy) @@ -38,11 +38,11 @@ <#assign orderReadyToPickInfoListSize = (orderReadyToPickInfoList.size())?default(0)> <#assign orderNeedsStockMoveInfoListSize = (orderNeedsStockMoveInfoList.size())?default(0)>
[Rush Orders, all Methods]
${orderReadyToPickInfoListSize}
${orderNeedsStockMoveInfoListSize}

[Rush Orders, all Methods]

${orderReadyToPickInfoListSize}

${orderNeedsStockMoveInfoListSize}

 -
+

<#if orderReadyToPickInfoList?has_content>

@@ -53,7 +53,7 @@ <#else>   -
+

${shipmentMethodType.description}
${orderReadyToPickInfoListSize}
${orderNeedsStockMoveInfoListSize}

${shipmentMethodType.description}

${orderReadyToPickInfoListSize}

${orderNeedsStockMoveInfoListSize}

 -
+

<#if orderReadyToPickInfoList?has_content> @@ -84,7 +84,7 @@ <#else>   -

+

${orderReadyToPickInfoListSizeTotal}
${orderNeedsStockMoveInfoListSizeTotal}
 -
+

<#if (orderReadyToPickInfoListSizeTotal > 0)> @@ -103,11 +103,11 @@ <#else>   -

+

${uiLabelMap.ProductNoOrdersFoundReadyToPickOrNeedStockMoves}.

${uiLabelMap.ProductNoOrdersFoundReadyToPickOrNeedStockMoves}.

Index: applications/product/webapp/facility/facility/ViewContactMechs.ftl =================================================================== --- applications/product/webapp/facility/facility/ViewContactMechs.ftl (revision 493251) +++ applications/product/webapp/facility/facility/ViewContactMechs.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]
+

${uiLabelMap.ProductFacility} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]

[${uiLabelMap.ProductNewFacility}] <#if facilityId?has_content> [${uiLabelMap.CommonViewCalendar}] @@ -39,7 +39,7 @@
-
 ${contactMechMap.contactMechType.get("description",locale)}
+

 ${contactMechMap.contactMechType.get("description",locale)}

   @@ -45,7 +45,7 @@ <#list contactMechMap.facilityContactMechPurposes as facilityContactMechPurpose> <#assign contactMechPurposeType = facilityContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")> -
+

<#if contactMechPurposeType?has_content> ${contactMechPurposeType.get("description",locale)} <#else> @@ -54,11 +54,11 @@ <#if facilityContactMechPurpose.thruDate?has_content> (${uiLabelMap.CommonExpire}: ${facilityContactMechPurpose.thruDate.toString()}) -

+

<#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId> <#assign postalAddress = contactMechMap.postalAddress> -
+

<#if postalAddress.toName?has_content>${uiLabelMap.CommonTo}: ${postalAddress.toName}
<#if postalAddress.attnName?has_content>${uiLabelMap.CommonAttn}: ${postalAddress.attnName}
${postalAddress.address1?if_exists}
@@ -67,7 +67,7 @@ ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} <#if postalAddress.countryGeoId?has_content>
${postalAddress.countryGeoId} -

+

<#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA"> <#assign addr1 = postalAddress.address1?if_exists> <#if (addr1.indexOf(" ") > 0)> @@ -78,7 +78,7 @@ <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId> <#assign telecomNumber = contactMechMap.telecomNumber> -
+

${telecomNumber.countryCode?if_exists} <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-${telecomNumber.contactNumber?if_exists} <#if facilityContactMech.extension?has_content>${uiLabelMap.CommonExt} ${facilityContactMech.extension} @@ -86,14 +86,14 @@ (lookup:anywho.com) (lookup:whitepages.com) -

+

<#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId> -
+

${contactMech.infoString?if_exists} (${uiLabelMap.CommonSendEmail}) -

+

<#elseif "WEB_ADDRESS" = contactMech.contactMechTypeId> -
+

${contactMech.infoString?if_exists} <#assign openAddress = contactMech.infoString?default("")> <#if !openAddress?starts_with("http") && !openAddress?starts_with("HTTP")><#assign openAddress = "http://" + openAddress> @@ -98,14 +98,14 @@ <#assign openAddress = contactMech.infoString?default("")> <#if !openAddress?starts_with("http") && !openAddress?starts_with("HTTP")><#assign openAddress = "http://" + openAddress> ((${uiLabelMap.CommonOpenPageNewWindow}) -

+

<#else> -
+

${contactMech.infoString?if_exists} -

+

-
(${uiLabelMap.CommonUpdated}: ${facilityContactMech.fromDate.toString()})
- <#if facilityContactMech.thruDate?has_content>
${uiLabelMap.CommonUpdatedEffectiveThru}: ${facilityContactMech.thruDate.toString()}
+

(${uiLabelMap.CommonUpdated}: ${facilityContactMech.fromDate.toString()})

+ <#if facilityContactMech.thruDate?has_content>
${uiLabelMap.CommonUpdatedEffectiveThru}: ${facilityContactMech.thruDate.toString()}

  
<#else> -
${uiLabelMap.CommonNoContactInformationOnFile}.
+

${uiLabelMap.CommonNoContactInformationOnFile}.
- + - + - + - + @@ -79,7 +79,7 @@ - + Index: applications/product/webapp/facility/group/EditFacilityGroupMembers.ftl =================================================================== --- applications/product/webapp/facility/group/EditFacilityGroupMembers.ftl (revision 493251) +++ applications/product/webapp/facility/group/EditFacilityGroupMembers.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductFacilities} ${uiLabelMap.CommonFor} <#if facilityGroup?exists>${(facilityGroup.facilityGroupName)?if_exists} [${uiLabelMap.CommonId}:${facilityGroupId?if_exists}]
+

${uiLabelMap.ProductFacilities} ${uiLabelMap.CommonFor} <#if facilityGroup?exists>${(facilityGroup.facilityGroupName)?if_exists} [${uiLabelMap.CommonId}:${facilityGroupId?if_exists}]

[${uiLabelMap.ProductNewGroup}] <#if (activeOnly) > [${uiLabelMap.CommonActiveInactive}] @@ -49,10 +49,10 @@
${uiLabelMap.ProductFacilityGroupId}

${uiLabelMap.ProductFacilityGroupId}

   ${facilityGroupId?if_exists} ${uiLabelMap.ProductNotModificationRecrationFacilityGroup} @@ -40,7 +40,7 @@
${uiLabelMap.ProductFacilityGroupType}

${uiLabelMap.ProductFacilityGroupType}

  
${uiLabelMap.ProductPrimaryParentGroup}

${uiLabelMap.ProductPrimaryParentGroup}

  
${uiLabelMap.ProductName}

${uiLabelMap.ProductName}

  
${uiLabelMap.CommonDescription}

${uiLabelMap.CommonDescription}

  
- - - - + + + + <#if (listSize > 0)> <#assign line = 0> @@ -117,8 +117,8 @@ -
${uiLabelMap.ProductAddFacilityGroupMember}:
-
+

${uiLabelMap.ProductAddFacilityGroupMember}:

+

${uiLabelMap.ProductFacilityId} : ${uiLabelMap.CommonFromDate} : Calendar @@ -123,7 +123,7 @@ ${uiLabelMap.CommonFromDate} : Calendar -

+

-
${uiLabelMap.PartyRoles} ${uiLabelMap.CommonFor} "${(facilityGroup.facilityGroupName)?if_exists}" [${uiLabelMap.CommonId} :${facilityGroupId?if_exists}]
+

${uiLabelMap.PartyRoles} ${uiLabelMap.CommonFor} "${(facilityGroup.facilityGroupName)?if_exists}" [${uiLabelMap.CommonId} :${facilityGroupId?if_exists}]

[${uiLabelMap.ProductNewGroup}]

@@ -22,9 +22,9 @@
${uiLabelMap.ProductFacilityNameId}
${uiLabelMap.CommonFromDateTime}
${uiLabelMap.ProductThruDateTimeSequence}
 

${uiLabelMap.ProductFacilityNameId}

${uiLabelMap.CommonFromDateTime}

${uiLabelMap.ProductThruDateTimeSequence}

 
- - - + + + <#list facilityRoles as facilityGroupRole> @@ -31,7 +31,7 @@ <#assign roleType = facilityGroupRole.getRelatedOne("RoleType")?if_exists> - + - - - - - + + + + + @@ -229,7 +229,7 @@ <#else> - +
${uiLabelMap.PartyPartyId}
${uiLabelMap.PartyRoleType}
 

${uiLabelMap.PartyPartyId}

${uiLabelMap.PartyRoleType}

 
${facilityGroupRole.partyId}
${roleType.get("description",locale)}

${roleType.get("description",locale)}

 [${uiLabelMap.CommonDelete}] @@ -43,8 +43,8 @@
-
${uiLabelMap.ProductAddFacilityGroupPartyRole} :
-
+

${uiLabelMap.ProductAddFacilityGroupPartyRole} :

+

${uiLabelMap.PartyPartyId} : ${uiLabelMap.PartyRoleType} : -

+


Index: applications/product/webapp/facility/group/EditFacilityGroupRollup.ftl =================================================================== --- applications/product/webapp/facility/group/EditFacilityGroupRollup.ftl (revision 493251) +++ applications/product/webapp/facility/group/EditFacilityGroupRollup.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductRollups} ${uiLabelMap.CommonFor}"${(facilityGroup.facilityGroupName)?if_exists}" [${uiLabelMap.CommonId}:${facilityGroupId?if_exists}]
+

${uiLabelMap.ProductRollups} ${uiLabelMap.CommonFor}"${(facilityGroup.facilityGroupName)?if_exists}" [${uiLabelMap.CommonId}:${facilityGroupId?if_exists}]

[${uiLabelMap.ProductNewGroup}]

@@ -25,10 +25,10 @@ - - - - + + + + <#if currentGroupRollups?has_content> <#list currentGroupRollups as facilityGroupRollup> @@ -56,7 +56,7 @@ <#else> - +
${uiLabelMap.ProductParentGroupId}
${uiLabelMap.CommonFromDate}
${uiLabelMap.ProductThruDateTimeSequence}
 

${uiLabelMap.ProductParentGroupId}

${uiLabelMap.CommonFromDate}

${uiLabelMap.ProductThruDateTimeSequence}

 
${uiLabelMap.ProductNoParentGroupsFound}.

${uiLabelMap.ProductNoParentGroupsFound}.
@@ -64,7 +64,7 @@
-
${uiLabelMap.CommonAdd} ${uiLabelMap.ProductParent} ${uiLabelMap.ProductGroupSelectCategoryFromDate}:
+

${uiLabelMap.CommonAdd} ${uiLabelMap.ProductParent} ${uiLabelMap.ProductGroupSelectCategoryFromDate}:

- - - - + + + + <#if parentGroupRollups?has_content> <#list parentGroupRollups as facilityGroupRollup> @@ -114,7 +114,7 @@ <#else> - +
${uiLabelMap.ProductChildGroupId}
${uiLabelMap.CommonFromDate}
${uiLabelMap.ProductThruDateTimeSequence}
 

${uiLabelMap.ProductChildGroupId}

${uiLabelMap.CommonFromDate}

${uiLabelMap.ProductThruDateTimeSequence}

 
${uiLabelMap.ProductNoChildGroupsFound}.

${uiLabelMap.ProductNoChildGroupsFound}.
@@ -122,7 +122,7 @@ -
${uiLabelMap.CommonAdd} ${uiLabelMap.ProductChild} ${uiLabelMap.ProductGroupSelectGroupFromDate} :
+

${uiLabelMap.CommonAdd} ${uiLabelMap.ProductChild} ${uiLabelMap.ProductGroupSelectGroupFromDate} :

- - - - + + + + <#list facilityGroups as facilityGroup> <#if facilityGroup.facilityGroupId?exists && facilityGroup.facilityGroupId != "_NA_"> Index: applications/product/webapp/facility/inventory/EditInventoryItem.ftl =================================================================== --- applications/product/webapp/facility/inventory/EditInventoryItem.ftl (revision 493251) +++ applications/product/webapp/facility/inventory/EditInventoryItem.ftl (working copy) @@ -15,7 +15,7 @@ under the License. --> -
${uiLabelMap.ProductEditInventoryItemWithId} [${inventoryItemId?if_exists}]
+

${uiLabelMap.ProductEditInventoryItemWithId} [${inventoryItemId?if_exists}]

[${uiLabelMap.ProductNewInventoryItem}] <#if inventoryItemId?exists> [${uiLabelMap.ProductTransferItem}] @@ -27,7 +27,7 @@
${uiLabelMap.ProductFacilityGroupNameId}
${uiLabelMap.ProductFacilityGroupType}
${uiLabelMap.ProductDescription}
 

${uiLabelMap.ProductFacilityGroupNameId}

${uiLabelMap.ProductFacilityGroupType}

${uiLabelMap.ProductDescription}

 
- + - + - + - + <#if "SERIALIZED_INV_ITEM" == (inventoryItem.inventoryItemTypeId)?if_exists> - + - + - + - + - + - + @@ -176,7 +176,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -197,11 +197,11 @@ <#if "NON_SERIAL_INV_ITEM" == (inventoryItem.inventoryItemTypeId)?if_exists> - + <#elseif "SERIALIZED_INV_ITEM" == (inventoryItem.inventoryItemTypeId)?if_exists> @@ -206,7 +206,7 @@ <#elseif "SERIALIZED_INV_ITEM" == (inventoryItem.inventoryItemTypeId)?if_exists> - + @@ -212,7 +212,7 @@ <#elseif inventoryItem?exists> - + @@ -226,7 +226,7 @@ <#if "NON_SERIAL_INV_ITEM" == (inventoryItem.inventoryItemTypeId)?if_exists>
-
${uiLabelMap.ProductPhysicalInventoryVariances}
+

${uiLabelMap.ProductPhysicalInventoryVariances}

${createPhysicalInventoryAndVarianceWrapper.renderFormString(context)}
Index: applications/product/webapp/facility/inventory/TransferInventoryItem.ftl =================================================================== --- applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (revision 493251) +++ applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (working copy) @@ -18,7 +18,7 @@
${illegalInventoryItem}
-
${uiLabelMap.ProductInventoryTransfer} ${uiLabelMap.CommonFrom} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]
+

${uiLabelMap.ProductInventoryTransfer}  ${uiLabelMap.CommonFrom} <#if facility?exists>${(facility.facilityName)?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]

[${uiLabelMap.ProductNewFacility}] <#--
${uiLabelMap.ProductInventoryItemId}

${uiLabelMap.ProductInventoryItemId}

   ${inventoryItemId} ${uiLabelMap.ProductNotModificationRecrationInventoryItem} @@ -44,7 +44,7 @@
${uiLabelMap.ProductInventoryItemTypeId}

${uiLabelMap.ProductInventoryItemTypeId}

  
${uiLabelMap.ProductProductId}

${uiLabelMap.ProductProductId}

   @@ -71,7 +71,7 @@
${uiLabelMap.PartyPartyId}

${uiLabelMap.PartyPartyId}

   @@ -80,7 +80,7 @@
${uiLabelMap.ProductStatus}

${uiLabelMap.ProductStatus}

  
${uiLabelMap.ProductDateReceived}

${uiLabelMap.ProductDateReceived}

   @@ -107,7 +107,7 @@
${uiLabelMap.ProductExpireDate}

${uiLabelMap.ProductExpireDate}

   @@ -115,7 +115,7 @@
${uiLabelMap.ProductFacilityContainer}

${uiLabelMap.ProductFacilityContainer}

   ${uiLabelMap.ProductSelectFacility} : @@ -140,11 +140,11 @@
${uiLabelMap.ProductFacilityLocation}

${uiLabelMap.ProductFacilityLocation}

   <#if facilityLocation?exists> -
+

${uiLabelMap.ProductArea} : ${facilityLocation.areaId?if_exists} ${uiLabelMap.ProductAisle} : ${facilityLocation.aisleId?if_exists} ${uiLabelMap.ProductSection} : ${facilityLocation.sectionId?if_exists} @@ -150,7 +150,7 @@ ${uiLabelMap.ProductSection} : ${facilityLocation.sectionId?if_exists} ${uiLabelMap.ProductLevel} : ${facilityLocation.levelId?if_exists} ${uiLabelMap.ProductPosition}: ${facilityLocation.positionId?if_exists} -

+

<#if inventoryItem?exists> @@ -171,7 +171,7 @@
${uiLabelMap.ProductLotId}

${uiLabelMap.ProductLotId}

  
${uiLabelMap.ProductUomId}

${uiLabelMap.ProductUomId}

  
${uiLabelMap.ProductBinNumber}

${uiLabelMap.ProductBinNumber}

  
${uiLabelMap.ProductPerUnitPrice}

${uiLabelMap.ProductPerUnitPrice}

  
${uiLabelMap.ProductComments}

${uiLabelMap.ProductComments}

  
${uiLabelMap.ProductAvailablePromiseQuantityHand}

${uiLabelMap.ProductAvailablePromiseQuantityHand}

   -
${inventoryItemData.availableToPromiseTotal?if_exists} / ${inventoryItemData.quantityOnHandTotal?if_exists}
-
${uiLabelMap.ProductPhysicalInventoryVariance}
+

${inventoryItemData.availableToPromiseTotal?if_exists} / ${inventoryItemData.quantityOnHandTotal?if_exists}

+

${uiLabelMap.ProductPhysicalInventoryVariance}
${uiLabelMap.ProductSerialNumber}

${uiLabelMap.ProductSerialNumber}

  
${uiLabelMap.ProductSerialAtpQoh}

${uiLabelMap.ProductSerialAtpQoh}

  
${uiLabelMap.ProductErrorType} [${inventoryItem.inventoryItemTypeId?if_exists}] ${uiLabelMap.ProductUnknownSpecifyType} .
--> @@ -27,7 +27,7 @@
- + - + - + @@ -76,7 +76,7 @@ - + - + @@ -99,13 +99,13 @@ - + +

${inventoryItem.comments}

<#else> -
--
+

--

@@ -112,15 +112,15 @@ - + <#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")> <#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")> - + <#elseif inventoryItem?exists> @@ -131,7 +131,7 @@ - + - + - + - + - + - + - + - + <#assign fac = delegator.findByPrimaryKey("Facility", Static["org.ofbiz.base.util.UtilMisc"].toMap("facilityId", inventoryTransfer.facilityIdTo))> - + - + - + - + - +

${uiLabelMap.CommonDuplicate}

+ <#list shipmentPackageRouteSegs as shipmentPackageRouteSeg> @@ -212,9 +212,9 @@ - + @@ -224,7 +224,7 @@ - + @@ -233,9 +233,9 @@ - + @@ -246,7 +246,7 @@ - + --> @@ -254,7 +254,7 @@ - +
${uiLabelMap.ProductInventoryItemId}

${uiLabelMap.ProductInventoryItemId}

   @@ -57,7 +57,7 @@
 
${uiLabelMap.ProductInventoryItemId}

${uiLabelMap.ProductInventoryItemId}

   ${inventoryItemId} @@ -66,11 +66,11 @@
 
${uiLabelMap.ProductInventoryItemTypeId}

${uiLabelMap.ProductInventoryItemTypeId}

   <#if inventoryItemType?exists> -
${(inventoryItemType.get("description",locale))?if_exists}
+

${(inventoryItemType.get("description",locale))?if_exists}
 
${uiLabelMap.ProductProductId}

${uiLabelMap.ProductProductId}

   <#if inventoryItem?exists && (inventoryItem.productId)?exists> @@ -86,13 +86,13 @@
 
${uiLabelMap.ProductStatus}

${uiLabelMap.ProductStatus}

   <#if inventoryStatus?exists> -
${(inventoryStatus.get("description",locale))?if_exists}
+

${(inventoryStatus.get("description",locale))?if_exists}

<#else> -
--
+

--
 
${uiLabelMap.ProductComments}

${uiLabelMap.ProductComments}

   <#if (inventoryItem.comments)?exists> -
${inventoryItem.comments}
 
${uiLabelMap.ProductSerialAtpQoh}

${uiLabelMap.ProductSerialAtpQoh}

   -
${(inventoryItem.availableToPromiseTotal)?if_exists}  - / ${(inventoryItem.quantityOnHandTotal)?if_exists}
+

${(inventoryItem.availableToPromiseTotal)?if_exists}  + / ${(inventoryItem.quantityOnHandTotal)?if_exists}

${(inventoryItem.serialNumber)?if_exists}

${(inventoryItem.serialNumber)?if_exists}

${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.
 
${uiLabelMap.ProductTransferStatus}

${uiLabelMap.ProductTransferStatus}

  
 
${uiLabelMap.ProductTransferSendDate}

${uiLabelMap.ProductTransferSendDate}

   @@ -157,7 +157,7 @@ <#if !(inventoryTransfer?exists)>
 
${uiLabelMap.ProductToFacilityContainer}

${uiLabelMap.ProductToFacilityContainer}

   ${uiLabelMap.ProductSelectFacility}: @@ -173,7 +173,7 @@
 
${uiLabelMap.ProductToLocation}

${uiLabelMap.ProductToLocation}

   @@ -186,7 +186,7 @@
 
${uiLabelMap.ProductComments}

${uiLabelMap.ProductComments}

   @@ -194,7 +194,7 @@
 
${uiLabelMap.ProductQuantityToTransfer}

${uiLabelMap.ProductQuantityToTransfer}

   <#if inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM")> @@ -201,7 +201,7 @@ <#elseif inventoryItem?exists && inventoryItem.inventoryItemTypeId.equals("SERIALIZED_INV_ITEM")> -
1
+

1

<#elseif inventoryItem?exists>
${uiLabelMap.ProductErrorType} ${(inventoryItem.inventoryItemTypeId)?if_exists} ${uiLabelMap.ProductUnknownSpecifyType}.
@@ -210,7 +210,7 @@ <#else>
 
${uiLabelMap.ProductTransferReceiveDate}

${uiLabelMap.ProductTransferReceiveDate}

   @@ -219,14 +219,14 @@
 
${uiLabelMap.ProductToFacilityContainer}

${uiLabelMap.ProductToFacilityContainer}

  
${(fac.facilityName)?if_exists}

${(fac.facilityName)?if_exists}
 
${uiLabelMap.ProductToLocation}

${uiLabelMap.ProductToLocation}

   @@ -239,7 +239,7 @@
 
${uiLabelMap.ProductComments}

${uiLabelMap.ProductComments}

   Index: applications/product/webapp/facility/inventory/receiveInventory.ftl =================================================================== --- applications/product/webapp/facility/inventory/receiveInventory.ftl (revision 493251) +++ applications/product/webapp/facility/inventory/receiveInventory.ftl (working copy) @@ -19,7 +19,7 @@
${invalidProductId}
-
${uiLabelMap.ProductReceiveInventory} ${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}" [${uiLabelMap.CommonId} :${facility.facilityId?if_exists}]
+

${uiLabelMap.ProductReceiveInventory}  ${uiLabelMap.CommonInto} <#if facility?has_content>"${facility.facilityName?default("Not Defined")}" [${uiLabelMap.CommonId} :${facility.facilityId?if_exists}]

[${uiLabelMap.ProductNewFacility}] - +

@@ -42,8 +42,8 @@
${listShipmentPlanForm.renderFormString(context)} -
${uiLabelMap.ProductShipmentTotalWeight}: ${totWeight}
-
${uiLabelMap.ProductShipmentTotalVolume}: ${totVolume}
+

${uiLabelMap.ProductShipmentTotalWeight}: ${totWeight}

+

${uiLabelMap.ProductShipmentTotalVolume}: ${totVolume}

${shipmentPlanToOrderItemsForm.renderFormString(context)} <#else>

${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]

Index: applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl =================================================================== --- applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (revision 493251) +++ applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (working copy) @@ -61,7 +61,7 @@
${shipmentRouteSegment.shipmentRouteSegmentId}

${shipmentRouteSegment.shipmentRouteSegmentId}
-
+

<#if originPostalAddress?has_content>[${uiLabelMap.CommonTo}: ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}] -

-
+

+

<#if destPostalAddress?has_content>[${uiLabelMap.CommonTo}: ${destPostalAddress.toName?if_exists},${uiLabelMap.CommonAttn}: ${destPostalAddress.attnName?if_exists}, ${destPostalAddress.address1?if_exists}, ${destPostalAddress.address2?if_exists}, ${destPostalAddress.city?if_exists}, ${destPostalAddress.stateProvinceGeoId?if_exists}, ${destPostalAddress.postalCode?if_exists}, ${destPostalAddress.countryGeoId?if_exists}] -

-
+

+

<#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}] -

-
+

+

<#if destTelecomNumber?has_content>[${destTelecomNumber.countryCode?if_exists} ${destTelecomNumber.areaCode?if_exists} ${destTelecomNumber.contactNumber?if_exists}] -

+

<#if "UPS" == shipmentRouteSegment.carrierPartyId?if_exists> @@ -202,8 +202,8 @@ ${uiLabelMap.CommonUpdate} -
${uiLabelMap.CommonDuplicate}
${uiLabelMap.CommonDelete}

${uiLabelMap.CommonDelete}
 

 

 -
+

${uiLabelMap.ProductPackage} :${shipmentPackageRouteSeg.shipmentPackageSeqId} <#if shipmentPackageRouteSeg.labelImage?exists> ${uiLabelMap.ProductViewLabelImage} @@ -219,7 +219,7 @@ <#if shipmentPackageRouteSeg.labelImage?exists> ${uiLabelMap.ProductViewLabelImage} -

+

${uiLabelMap.ProductTrack} #: ${uiLabelMap.ProductBox} #:${uiLabelMap.ProductTrack} #: ${uiLabelMap.ProductBox} #: ${uiLabelMap.CommonUpdate}
${uiLabelMap.CommonDelete}

${uiLabelMap.CommonDelete}
 

 

 -
${uiLabelMap.ProductAddPackageInfo} : +

${uiLabelMap.ProductAddPackageInfo} : -

+

Track#: Box#:Track#: Box#: ${uiLabelMap.CommonAdd}
 

 
${uiLabelMap.ProductNewSegment} :

${uiLabelMap.ProductNewSegment} :
${uiLabelMap.ProductFindShipment}
 -
+

<#if requestParameters.facilityId?has_content> ${uiLabelMap.ProductQuickShipOrder} ${uiLabelMap.ProductNewShipment} @@ -42,7 +42,7 @@ ${uiLabelMap.ProductQuickShipOrder} ${uiLabelMap.ProductNewShipment} ${uiLabelMap.ProductLookupShipment} -

+

@@ -211,11 +211,11 @@ <#assign shipmentType = shipment.getRelatedOneCache("ShipmentType")?if_exists>
${shipment.shipmentId}
${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}
${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}
${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]
${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]
${(shipment.estimatedShipDate.toString())?if_exists}

${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}

${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}

${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]

${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]

${(shipment.estimatedShipDate.toString())?if_exists}

 ${uiLabelMap.CommonView}
${uiLabelMap.ProductNoShipmentsFound}.

${uiLabelMap.ProductNoShipmentsFound}.
Index: applications/product/webapp/facility/shipment/PackOrder.ftl =================================================================== --- applications/product/webapp/facility/shipment/PackOrder.ftl (revision 493251) +++ applications/product/webapp/facility/shipment/PackOrder.ftl (working copy) @@ -25,14 +25,14 @@
-
${uiLabelMap.ProductPackOrder} in ${facility.facilityName?if_exists} [${facilityId?if_exists}]
+

${uiLabelMap.ProductPackOrder} in ${facility.facilityName?if_exists} [${facilityId?if_exists}]

<#if shipmentId?has_content> -
+

${uiLabelMap.CommonView} ${uiLabelMap.ProductPackingSlip} ${uiLabelMap.CommonOr} ${uiLabelMap.CommonView} ${uiLabelMap.ProductBarcode} ${uiLabelMap.CommonFor} ${uiLabelMap.ProductShipmentId} ${shipmentId} -

+

<#if invoiceIds?exists && invoiceIds?has_content> -
+

${uiLabelMap.AccountingInvoices}:

    <#list invoiceIds as invoiceId> @@ -42,7 +42,7 @@
-
+

 
@@ -52,7 +52,7 @@ - + + @@ -94,7 +94,7 @@
${uiLabelMap.ProductOrderId} #

${uiLabelMap.ProductOrderId} #

   @@ -59,7 +59,7 @@ / -
${uiLabelMap.ProductHideGrid}: checked="">

${uiLabelMap.ProductHideGrid}: checked="">
 
${uiLabelMap.ProductShipToAddress}:
-
+

${uiLabelMap.CommonTo}: ${postalAddress.toName?default("")}
<#if postalAddress.attnName?has_content> ${uiLabelMap.CommonAttn}: ${postalAddress.attnName}
@@ -105,7 +105,7 @@ ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists}
${postalAddress.countryGeoId} -

+

   @@ -110,7 +110,7 @@   
${uiLabelMap.ProductCarrierShipmentMethod}:
-
+

<#if carrier == "USPS"> <#assign color = "red"> <#elseif carrier == "UPS"> @@ -123,7 +123,7 @@   ${orderItemShipGroup.shipmentMethodTypeId?default("??")} -

+

   @@ -128,7 +128,7 @@   
${uiLabelMap.OrderShipping} ${uiLabelMap.ProductInstruction}:
-
${orderItemShipGroup.shippingInstructions?default("(none)")}
+

${orderItemShipGroup.shippingInstructions?default("(none)")}
@@ -147,7 +147,7 @@ - + @@ -215,12 +215,12 @@ <#assign inputQty = (orderItemQuantity - shippedQuantity - packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId))> - - - - - - + + + + + + - - - - - - + + + + + + Index: applications/product/webapp/facility/shipment/QuickShipOrder.ftl =================================================================== --- applications/product/webapp/facility/shipment/QuickShipOrder.ftl (revision 493251) +++ applications/product/webapp/facility/shipment/QuickShipOrder.ftl (working copy) @@ -22,7 +22,7 @@ <#if security.hasEntityPermission("FACILITY", "_VIEW", session)> -
${uiLabelMap.ProductQuickShipOrderFrom}${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]
+

${uiLabelMap.ProductQuickShipOrderFrom} ${facility.facilityName?if_exists} [${uiLabelMap.CommonId}:${facilityId?if_exists}]

[${uiLabelMap.ProductNextShipment}] <#if shipment?has_content> [${uiLabelMap.ProductEditShipment}] @@ -32,7 +32,7 @@ <#if shipment?exists> <#if 1 < shipmentPackages.size()> <#-- multiple packages --> -
${uiLabelMap.ProductMorePackageFoundShipment}.
+

${uiLabelMap.ProductMorePackageFoundShipment}.

<#else> <#-- single package --> <#assign shipmentPackage = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentPackages))?if_exists> @@ -41,7 +41,7 @@ <#if (0 < weight?double) && !requestParameters.reweigh?exists> <#if 1 < shipmentRoutes.size()> <#-- multiple routes --> -
${uiLabelMap.ProductMoreRouteSegmentFound}.
+

${uiLabelMap.ProductMoreRouteSegmentFound}.

<#elseif !requestParameters.shipmentRouteSegmentId?exists || requestAttributes._ERROR_MESSAGE_?exists> <#assign shipmentRoute = (Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRoutes))?if_exists> @@ -165,7 +165,7 @@ --> <#else> -
${uiLabelMap.ProductErrorNoPackagesFoundForShipment} !
+

${uiLabelMap.ProductErrorNoPackagesFoundForShipment} !

${pages.get("/shipment/ViewShipmentInfo.ftl")} @@ -182,7 +182,7 @@
${uiLabelMap.ProductProduct} #

${uiLabelMap.ProductProduct} #

   @@ -156,10 +156,10 @@
 
 -
+

${uiLabelMap.CommonCurrent} ${uiLabelMap.ProductPackage} ${uiLabelMap.CommonSequence}: ${packingSession.getCurrentPackageSeq()} -

+

0)>checked=""/>
${orderItem.orderItemSeqId}
${orderItem.productId?default("N/A")}
${orderItem.itemDescription?if_exists}
${orderItemQuantity}
${shippedQuantity?default(0)}
${packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId)}

${orderItem.orderItemSeqId}

${orderItem.productId?default("N/A")}

${orderItem.itemDescription?if_exists}

${orderItemQuantity}

${shippedQuantity?default(0)}

${packingSession.getPackedQuantity(orderId, orderItem.orderItemSeqId, shipGroupSeqId)}

    @@ -306,12 +306,12 @@ <#list packedLines as line> <#assign orderItem = orderReadHelper.getOrderItem(line.getOrderItemSeqId())?if_exists>
${line.getOrderItemSeqId()}
${line.getProductId()?default("N/A")}
${(orderItem.itemDescription)?default("[N/A]")}
${line.getInventoryItemId()}
${line.getQuantity()}
${line.getPackageSeq()}

${line.getOrderItemSeqId()}

${line.getProductId()?default("N/A")}

${(orderItem.itemDescription)?default("[N/A]")}

${line.getInventoryItemId()}

${line.getQuantity()}

${line.getPackageSeq()}

 ${uiLabelMap.CommonClear}
- + @@ -98,8 +98,8 @@ @@ -106,8 +106,8 @@ @@ -114,7 +114,7 @@ @@ -121,7 +121,7 @@
${uiLabelMap.ProductOrderNumber}

${uiLabelMap.ProductOrderNumber}

   Index: applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl =================================================================== --- applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl (revision 493251) +++ applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl (working copy) @@ -80,8 +80,8 @@ ${uiLabelMap.ProductFacilities}   -
${uiLabelMap.ProductOrigin}: ${(originFacility.facilityName)?if_exists} [${(shipment.originFacilityId?if_exists)}]
-
${uiLabelMap.ProductDestination}: ${(destinationFacility.facilityName)?if_exists} [${(shipment.destinationFacilityId?if_exists)}]
+

${uiLabelMap.ProductOrigin}: ${(originFacility.facilityName)?if_exists} [${(shipment.originFacilityId?if_exists)}]

+

${uiLabelMap.ProductDestination}: ${(destinationFacility.facilityName)?if_exists} [${(shipment.destinationFacilityId?if_exists)}]
${uiLabelMap.ProductAddresses}   -
${uiLabelMap.ProductOrigin}: ${shipment.originContactMechId?if_exists} <#if originPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}]
-
${uiLabelMap.ProductDestination}: ${shipment.destinationContactMechId?if_exists} <#if destinationPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${destinationPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destinationPostalAddress.attnName?if_exists}, ${destinationPostalAddress.address1?if_exists}, ${destinationPostalAddress.address2?if_exists}, ${destinationPostalAddress.city?if_exists}, ${destinationPostalAddress.stateProvinceGeoId?if_exists}, ${destinationPostalAddress.postalCode?if_exists}, ${destinationPostalAddress.countryGeoId?if_exists}]
+

${uiLabelMap.ProductOrigin}: ${shipment.originContactMechId?if_exists} <#if originPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}]

+

${uiLabelMap.ProductDestination}: ${shipment.destinationContactMechId?if_exists} <#if destinationPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${destinationPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destinationPostalAddress.attnName?if_exists}, ${destinationPostalAddress.address1?if_exists}, ${destinationPostalAddress.address2?if_exists}, ${destinationPostalAddress.city?if_exists}, ${destinationPostalAddress.stateProvinceGeoId?if_exists}, ${destinationPostalAddress.postalCode?if_exists}, ${destinationPostalAddress.countryGeoId?if_exists}]
${uiLabelMap.ProductPhoneNumbers}   -
${uiLabelMap.ProductOrigin}: ${shipment.originTelecomNumberId?if_exists} <#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}]
-
${uiLabelMap.ProductDestination}: ${shipment.destinationTelecomNumberId?if_exists} <#if destinationTelecomNumber?has_content>[${destinationTelecomNumber.countryCode?if_exists} ${destinationTelecomNumber.areaCode?if_exists} ${destinationTelecomNumber.contactNumber?if_exists}]
+

${uiLabelMap.ProductOrigin}: ${shipment.originTelecomNumberId?if_exists} <#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}]

+

${uiLabelMap.ProductDestination}: ${shipment.destinationTelecomNumberId?if_exists} <#if destinationTelecomNumber?has_content>[${destinationTelecomNumber.countryCode?if_exists} ${destinationTelecomNumber.areaCode?if_exists} ${destinationTelecomNumber.contactNumber?if_exists}]
${uiLabelMap.CommonCreated}   -
${uiLabelMap.CommonBy} [${shipment.createdByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.createdDate.toString())?if_exists}
+

${uiLabelMap.CommonBy} [${shipment.createdByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.createdDate.toString())?if_exists}
${uiLabelMap.CommonLastUpdated}   -
${uiLabelMap.CommonBy} [${shipment.lastModifiedByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.lastModifiedDate.toString())?if_exists}
+

${uiLabelMap.CommonBy} [${shipment.lastModifiedByUserLogin?if_exists}] ${uiLabelMap.CommonOn} ${(shipment.lastModifiedDate.toString())?if_exists}
Index: applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl =================================================================== --- applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl (revision 493251) +++ applications/product/webapp/facility/shipment/ViewShipmentItemInfo.ftl (working copy) @@ -32,19 +32,19 @@ <#assign shipmentPackageContents = shipmentItemData.shipmentPackageContents> <#assign product = shipmentItemData.product?if_exists>
${shipmentItem.shipmentItemSeqId}
${(product.internalName)?if_exists} [${shipmentItem.productId?if_exists}]
${shipmentItem.quantity?default(" ")}
${shipmentItem.shipmentContentDescription?default(" ")}

${shipmentItem.shipmentItemSeqId}

${(product.internalName)?if_exists} [${shipmentItem.productId?if_exists}]

${shipmentItem.quantity?default(" ")}

${shipmentItem.shipmentContentDescription?default(" ")}
 
${uiLabelMap.ProductOrderItem} :${orderShipment.orderId?if_exists}:${orderShipment.orderItemSeqId?if_exists}
 
${orderShipment.quantity?if_exists}
 
 

 

${uiLabelMap.ProductOrderItem} :${orderShipment.orderId?if_exists}:${orderShipment.orderItemSeqId?if_exists}

 

${orderShipment.quantity?if_exists}

 

 
 
${uiLabelMap.ProductOrderItem} :${itemIssuance.orderId?if_exists}:${itemIssuance.orderItemSeqId?if_exists}
${uiLabelMap.ProductInventory} :${itemIssuance.inventoryItemId?if_exists}
${itemIssuance.quantity?if_exists}
${itemIssuance.issuedDateTime?if_exists}
${uiLabelMap.ProductFuturePartyRoleList}

 

${uiLabelMap.ProductOrderItem} :${itemIssuance.orderId?if_exists}:${itemIssuance.orderItemSeqId?if_exists}

${uiLabelMap.ProductInventory} :${itemIssuance.inventoryItemId?if_exists}

${itemIssuance.quantity?if_exists}

${itemIssuance.issuedDateTime?if_exists}

${uiLabelMap.ProductFuturePartyRoleList}
 
${uiLabelMap.ProductPackage} :${shipmentPackageContent.shipmentPackageSeqId}
${shipmentPackageContent.quantity?if_exists}
 

 

${uiLabelMap.ProductPackage} :${shipmentPackageContent.shipmentPackageSeqId}

${shipmentPackageContent.quantity?if_exists}

 
${shipmentPackage.shipmentPackageSeqId}
${(shipmentPackage.dateCreated.toString())?if_exists}

${shipmentPackage.shipmentPackageSeqId}

${(shipmentPackage.dateCreated.toString())?if_exists}

 ${uiLabelMap.ProductWeight} : ${shipmentPackage.weight?if_exists} ${uiLabelMap.ProductWeightUnit} : <#if weightUom?has_content>${weightUom.get("description",locale)}<#else>${shipmentPackage.weightUomId?if_exists}
 
${uiLabelMap.ProductItem} :${shipmentPackageContent.shipmentItemSeqId}
${uiLabelMap.ProductQuantity} :${shipmentPackageContent.quantity?if_exists}
 

 

${uiLabelMap.ProductItem} :${shipmentPackageContent.shipmentItemSeqId}

${uiLabelMap.ProductQuantity} :${shipmentPackageContent.quantity?if_exists}

 
 
${uiLabelMap.ProductRouteSegment} :${shipmentPackageRouteSeg.shipmentRouteSegmentId}

 

${uiLabelMap.ProductRouteSegment} :${shipmentPackageRouteSeg.shipmentRouteSegmentId}

 ${uiLabelMap.ProductTracking} : ${shipmentPackageRouteSeg.trackingCode?if_exists} ${uiLabelMap.ProductBox} : ${shipmentPackageRouteSeg.boxNumber?if_exists}
${shipmentRouteSegment.shipmentRouteSegmentId}

${shipmentRouteSegment.shipmentRouteSegmentId}

 ${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRouteSegment.carrierPartyId?if_exists}] ${shipmentMethodType.description?default(shipmentRouteSegment.shipmentMethodTypeId?if_exists)} @@ -65,37 +65,37 @@ ${uiLabelMap.ProductOrigin} : ${(originFacility.facilityName)?if_exists} [${originFacility.facilityId?if_exists}] ${uiLabelMap.ProductDest} : ${(destFacility.facilityName)?if_exists} [${destFacility.facilityId?if_exists}]
-
+

${uiLabelMap.ProductOrigin} : ${shipmentRouteSegment.originContactMechId?if_exists} <#if originPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}] -

-
+

+

${uiLabelMap.ProductDest}: ${shipmentRouteSegment.destContactMechId?if_exists} <#if destPostalAddress?has_content>[${uiLabelMap.CommonTo} : ${destPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destPostalAddress.attnName?if_exists}, ${destPostalAddress.address1?if_exists}, ${destPostalAddress.address2?if_exists}, ${destPostalAddress.city?if_exists}, ${destPostalAddress.stateProvinceGeoId?if_exists}, ${destPostalAddress.postalCode?if_exists}, ${destPostalAddress.countryGeoId?if_exists}] -

-
+

+

${uiLabelMap.ProductOrigin} : ${shipmentRouteSegment.originTelecomNumberId?if_exists} <#if originTelecomNumber?has_content>[${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}] -

-
+

+

${uiLabelMap.ProductDest} : ${shipmentRouteSegment.destTelecomNumberId?if_exists} <#if destTelecomNumber?has_content>[${destTelecomNumber.countryCode?if_exists} ${destTelecomNumber.areaCode?if_exists} ${destTelecomNumber.contactNumber?if_exists}] -

+

-
${(carrierServiceStatus.description)?default(" ")}
-
${shipmentRouteSegment.trackingIdNumber?default(" ")}
-
[${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists} - ${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}] -
[${(shipmentRouteSegment.actualStartDate.toString())?if_exists} - ${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}] +

${(carrierServiceStatus.description)?default(" ")}

+

${shipmentRouteSegment.trackingIdNumber?default(" ")}

+

[${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists} - ${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}] +

[${(shipmentRouteSegment.actualStartDate.toString())?if_exists} - ${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}]

-
${shipmentRouteSegment.billingWeight?if_exists} ${(billingWeightUom.get("description",locale))?if_exists} [${(billingWeightUom.abbreviation)?if_exists}]
-
${(currencyUom.get("description",locale))?default(" ")}
-
${(shipmentRouteSegment.actualTransportCost)?default(" ")}
-
${(shipmentRouteSegment.actualServiceCost)?default(" ")}
-
${(shipmentRouteSegment.actualOtherCost)?default(" ")}
-
${(shipmentRouteSegment.actualCost)?default(" ")}
+

${shipmentRouteSegment.billingWeight?if_exists} ${(billingWeightUom.get("description",locale))?if_exists} [${(billingWeightUom.abbreviation)?if_exists}]

+

${(currencyUom.get("description",locale))?default(" ")}

+

${(shipmentRouteSegment.actualTransportCost)?default(" ")}

+

${(shipmentRouteSegment.actualServiceCost)?default(" ")}

+

${(shipmentRouteSegment.actualOtherCost)?default(" ")}

+

${(shipmentRouteSegment.actualCost)?default(" ")}
 
${uiLabelMap.ProductPackage} :${shipmentPackageRouteSeg.shipmentPackageSeqId}

 

${uiLabelMap.ProductPackage} :${shipmentPackageRouteSeg.shipmentPackageSeqId}

 ${uiLabelMap.ProductTracking} : ${shipmentPackageRouteSeg.trackingCode?if_exists} ${uiLabelMap.ProductBox} : ${shipmentPackageRouteSeg.boxNumber?if_exists}